| Age | Commit message (Collapse) | Author |
|---|
|
Previously it was "user has already been taken", when really we were
saying the user has already been reported.
|
|
Autofill abuse message text with user url. Closes #2838
See merge request !2396
|
|
|
|
|
|
Add the version each feature was introduced in GitHub importer
See merge request !2457
|
|
[ci skip]
|
|
Added advanced SAML troubleshooting
/cc @dblessing @balameb
See merge request !2456
|
|
Prevent StateMachine warnings from outputting during a cron task
[ci skip]
Closes #5931
See merge request !2458
|
|
[ci skip]
Closes #5931
|
|
|
|
|
|
Fix autocomplete for new issues/MRs/snippets
Fixes gitlab-org/gitlab-ce#8067
See merge request !2446
|
|
Fix alignment issues after a fix on titles weight
Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/
## Commit title alignment fixed
**The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).**
## Tags name in list
See merge request !2431
|
|
Let the CI runner know about builds that this build depends on
This allows us to implement artifacts passing: runner will download artifacts from all prior builds. It will happen automatically, and always, as long as artifacts are enabled.
## The changes:
This MR exposes list of prior builds in CI::API::Builds.
**The API response when asking for builds**
```json
{
"id": 48584,
"ref": "0.1.1",
"tag": true,
"sha": "d63117656af6ff57d99e50cc270f854691f335ad",
"status": "success",
"name": "pages",
"token": "9dd60b4f1a439d1765357446c1084c",
"stage": "test",
"project_id": 479,
"project_name": "test",
"commands": "echo commands",
"repo_url": "http://gitlab-ci-token:token@gitlab.example/group/test.git",
"before_sha": "0000000000000000000000000000000000000000",
"allow_git_fetch": false,
"options": {
"image": "docker:image",
"artifacts": {
"paths": [
"public"
]
},
"cache": {
"paths": [
"vendor"
]
}
},
"timeout": 3600,
"variables": [
{
"key": "CI_BUILD_TAG",
"value": "0.1.1",
"public": true
}
],
"dependencies": {
"builds": [
{
"id": 48584,
"ref": "0.1.1",
"tag": true,
"sha": "d63117656af6ff57d99e50cc270f854691f335ad",
"status": "success",
"name": "build",
"token": "9dd60b4f1a439d1765357446c1084c",
"stage": "build",
"project_id": 479,
"project_name": "test",
"artifacts_file": {
"filename": "artifacts.zip",
"size": 0
}
}
]
}
}
```
## How it will work?
**Example:**
```
build:
type: build
script:
- echo TEST > test_file
artifacts:
untracked: true
rspec:
type: test
script:
- test-my-project
staging:
type: deploy
script:
- scp test_file root@server.com:
```
**The flow:**
1. We run `build`. The `build` creates a file `test_file`. This file gets archived and send us build artifacts.
2. We run `rspec`. The `rspec` downloads build artifacts from `build`. Uses the `test_file`.
3. We run `staging`. The `staging` downloads build artifacts from `build` and `rspec`, but since the `rspec` doesn't have build artifacts we skip that build. Deploys the `test_file`.
This partially implements the https://gitlab.com/gitlab-org/gitlab-ce/issues/3423.
In the next release we will introduce option to configure what artifacts are received.
/cc @grzesiek @DouweM @sytse @rspeicher
See merge request !2437
|
|
Allow access to artifacts for users with reporter role
This is originally introduced by @ajohnsn in this merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2259
I've added and refactored specs, original commit by @ajohnsn has been cherry picked here.
See merge request !2448
|
|
Don't send (fake) email during dev bootstrap
This allows you to do:
rake dev:setup BOOTSTRAP=1
and prevent dozens of letter_opener email popups in your browser.
In the latest GDK we automatically set BOOTSTRAP=1 during `make`.
[ci skip]
See merge request !2447
|
|
|
|
|
|
Simplify Procfile
These changes are meant to make development easier.
[ci skip]
See merge request !2429
|
|
Fix signup using kerberos
kerberos only provides a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name.
I also created an issue for this: #5945
See merge request !2336
|
|
Consider that URL can end with '/' before redirecting.
Closes #7975
See merge request !2416
|
|
some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore
a signup fails because the name is empty. Best guess for the name is
probably the username, therefore use it as name.
|
|
[ci skip]
|
|
|
|
|
|
This allows you to do:
rake dev:setup BOOTSTRAP=1
and prevent dozens of letter_opener emai popups in your browser.
|
|
Refactor GitHub importer documentation
To be merged when gitlab-org/gitlab-ce!2324 is finished.
See merge request !2390
|
|
|
|
Also fix a few places where page_404 should be render_404.
|
|
|
|
|
|
This behavior got lost in the previous commit.
|
|
|
|
'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master'
Fix javascript error with deleting messages in issue or merge request
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
See merge request !2442
|
|
Moving 8.5 change to 8.4 since we're merging master into stable for now.
[ci skip]
|
|
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
|
|
Prefer custom WOFF2 fonts if the browser supports them
[ci skip]
See merge request !2443
|
|
[ci skip]
|
|
Add triggers API
References #4264
See merge request !2286
|
|
Fixes new layout
* fix empty project page
* fix commit -> builds page missing margin
See merge request !2440
|
|
|
|
* master: (150 commits)
fixes margin and padding
Update mailroom/postfix documentation [ci skip]
Fix css mess around git clone panel. Align it properly
Fix missing padding for user/group pages
Fix parse_gollum_tags matcher
Update documentation on Banzai::Filter::GollumTagsFilter
Add tests for the wiki pipeline
Refactoring Banzai::Filter::GollumTagsFilter
Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
Remove GollumTagsPipeline
Refactoring Gitlab::GithubImport::Importer
Remove unnecessary brackets on WIKI_SLUG_ID route constraints
Move js function to removing accents to vendor/assets/javascripts
Update CHANGELOG
Use the WikiPipeline when rendering the wiki markdown content
Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML
Relax constraints for wiki slug
Import GitHub wiki into GitLab
Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus
Revert changes to how the notes are paginated in the API
...
Conflicts:
doc/api/README.md
lib/api/entities.rb
|
|
fixes margin and padding
See merge request !2439
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
Properly generate diff of orphan commits, like the first commit in a
repository
Fixes gitlab-org/gitlab_git#14
See merge request !2427
|
|
This allows us to implement artifacts passing: runner will download artifacts from all prior builds
|
|
Backport two commits from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110
See merge request !2424
|
|
Fix cross-project reference clipboard text
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339
See merge request !2420
|
