summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-0911-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the raw push option Array was sent to Pipeline::Chain::Skip. This commit updates this class (and the chain of classes that pass the push option parameters from the API internal `post_receive` endpoint to that class) to treat push options as a Hash of options parsed by GitLab::PushOptions. The GitLab::PushOptions class takes options like this: -o ci.skip -o merge_request.create -o merge_request.target=branch and turns them into a Hash like this: { ci: { skip: true }, merge_request: { create: true, target: 'branch' } } This now how Pipeline::Chain::Skip is determining if the `ci.skip` push option was used.
| | * | | | | | | | | | | | | | | | Change double quote strings to single quotesLuke Duncalfe2019-04-091-19/+19
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Support merge request create with push optionsLuke Duncalfe2019-04-099-7/+707
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To create a new merge request: git push -u origin -o merge_request.create To create a new merge request setting target branch: git push -u origin -o merge_request.create \ -o merge_request.target=123 To update an existing merge request with a new target branch: git push -u origin -o merge_request.target=123 A new Gitlab::PushOptions class handles parsing and validating the push options array. This can be the start of the standard of GitLab accepting push options that follow namespacing rules. Rules are discussed in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263. E.g. these push options: -o merge_request.create -o merge_request.target=123 Become parsed as: { merge_request: { create: true, target: '123', } } And are fetched with the class via: push_options.get(:merge_request) push_options.get(:merge_request, :create) push_options.get(:merge_request, :target) A new MergeRequests::PushOptionsHandlerService takes the `merge_request` namespaced push options and handles creating and updating merge requests. Any errors encountered are passed to the existing `output` Hash in Api::Internal's `post_receive` endpoint, and passed to gitlab-shell where they're output to the user. Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263
| * | | | | | | | | | | | | | | | Merge branch 'fix-project-creation-level' into 'master'54404-add-a-custom-commit-message-when-applying-a-suggested-changeStan Hu2019-04-092-22/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix backport of project_creation_level migration See merge request gitlab-org/gitlab-ce!27167
| | * | | | | | | | | | | | | | | | Fix backport of project_creation_level migrationKamil Trzciński2019-04-092-22/+17
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '59903-env-css' into 'master'Phil Hughes2019-04-0910-349/+288
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stylelint warnings in environments Closes #59903 See merge request gitlab-org/gitlab-ce!27131
| | * | | | | | | | | | | | | | | Fixes stylelint warnings in environmentsFilipa Lacerda2019-04-0910-349/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deletes unused CSS Moves prometheus selectors into a prometheus file
| * | | | | | | | | | | | | | | | Merge branch 'docs-gfm-links' into 'master'Achilleas Pipinellis2019-04-091-19/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add examples for linking to header IDs Closes #57191 See merge request gitlab-org/gitlab-ce!26091
| | * | | | | | | | | | | | | | | | Docs: Add examples for linking to header IDsMarcel Amirault2019-04-091-19/+19
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'docs-anchors-21-issues' into 'master'Achilleas Pipinellis2019-04-097-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix anchors related to issues See merge request gitlab-org/gitlab-ce!27165
| | * | | | | | | | | | | | | | | | Docs: Fix anchors related to issuesMarcel Amirault2019-04-097-11/+11
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'docs/make-content-us-english' into 'master'Achilleas Pipinellis2019-04-092-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use US English for content See merge request gitlab-org/gitlab-ce!27154
| | * | | | | | | | | | | | | | | | Use US English for contentEvan Read2019-04-092-6/+6
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'docs/fix-commit-api-render' into 'master'Achilleas Pipinellis2019-04-091-13/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code block not rendering See merge request gitlab-org/gitlab-ce!27153
| | * | | | | | | | | | | | | | | | Fix code block not renderingEvan Read2019-04-091-13/+14
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'more-consistent-namespacing-vuex-example-code' into 'master'Filipa Lacerda2019-04-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RECEIVE namespace rather than REQUEST See merge request gitlab-org/gitlab-ce!27130
| | * | | | | | | | | | | | | | | | Use RECEIVE namespace rather than REQUESTmore-consistent-namespacing-vuex-example-codeMark Florian2019-04-081-2/+2
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the mutation type name closer to the associated action, so the documented example is more consistent.
| * | | | | | | | | | | | | | | | Merge branch 'noteable-note-ee-differences' into 'master'Filipa Lacerda2019-04-092-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed EE differences in noteable_note.vue Closes gitlab-ee#9972 See merge request gitlab-org/gitlab-ce!27128
| | * | | | | | | | | | | | | | | | Fixed EE differences in noteable_note.vuePhil Hughes2019-04-092-8/+22
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9972
| * | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2019-04-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6669-extract-ee-specific-files-lines-for-ci-cd-spec-requests-api-ce' into 'master' Resolve "Extract EE specific files/lines for CI/CD spec/requests/api" CE See merge request gitlab-org/gitlab-ce!27147
| | * | | | | | | | | | | | | | | Use have_gitlab_http_status in runner_spec6669-extract-ee-specific-files-lines-for-ci-cd-spec-requests-api-ceMatija Čupić2019-04-091-1/+1
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '6573-extract-ee-spec-features-boards-ce' into 'master'Robert Speicher2019-04-092-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for spec/features/boards" See merge request gitlab-org/gitlab-ce!27110
| | * | | | | | | | | | | | | | | Add helper reference6573-extract-ee-spec-features-boards-cecharlieablett2019-04-081-0/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Abstract out method from spec to supportcharlieablett2019-04-082-0/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'osw-schedule-multiple-mr-assignees-ff-auto-enabling' into 'master'Yorick Peterse2019-04-092-6/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods to check dead and retrying jobs See merge request gitlab-org/gitlab-ce!27149
| | * | | | | | | | | | | | | | | | Add methods to check dead and retrying jobsosw-schedule-multiple-mr-assignees-ff-auto-enablingOswaldo Ferreira2019-04-082-6/+62
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It adds two methods for checking if a background job (for a given class) has dead or retrying jobs.
| * | | | | | | | | | | | | | | | Merge branch 'sl-lower-remove-rspec-retries' into 'master'Sean McGivern2019-04-097-9/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce rspec retries See merge request gitlab-org/gitlab-ce!26934
| | * | | | | | | | | | | | | | | | Reduce number of rspec retriesSanad Liaquat2019-04-097-9/+13
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In both e2e QA tests and unit tests, reduce the number of retires to 2 (i.e., 1 initial and one retry)
| * | | | | | | | | | | | | | | | Merge branch 'improve/rack-clean-path-info' into 'master'Douwe Maan2019-04-091-32/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rack::Utils.clean_path_info instead of copy-pasted version. See merge request gitlab-org/gitlab-ce!27001
| | * | | | | | | | | | | | | | | | Use Rack::Utils.clean_path_info instead of copy-pasted version.Vasiliy Ermolovich2019-04-041-32/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '60162-fix-time-windows' into 'master'Douwe Maan2019-04-095-14/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Environments#additional_metrics TypeError, ensure unix format Closes #60162 See merge request gitlab-org/gitlab-ce!27118
| | * | | | | | | | | | | | | | | | | Resolve Environments#additional_metrics TypeError, ensure unix formatSarah Yasonik2019-04-095-14/+51
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-099-24/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug that the project statistics is not updated See merge request gitlab-org/gitlab-ce!26854
| | * | | | | | | | | | | | | | | | Refactor: extract duplicate steps to a service classHiroyuki Sato2019-04-056-53/+79
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Update the project statistics immediatellyHiroyuki Sato2019-04-052-0/+11
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Refactor project_cache_worker_keyHiroyuki Sato2019-04-052-2/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-057-22/+107
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.9.7GitLab Release Tools Bot2019-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.7.11GitLab Release Tools Bot2019-04-091-0/+4
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | Merge branch 'docs-fix-page-specific-javascript-link' into 'master'Achilleas Pipinellis2019-04-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix page specific JavaScript link in documentation See merge request gitlab-org/gitlab-ce!27162
| * | | | | | | | | | | | | | | | | Fix page specific JavaScript link in documentationMark Florian2019-04-091-3/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'docs/update-registry-user' into 'master'Achilleas Pipinellis2019-04-091-17/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update auth with registry docs See merge request gitlab-org/gitlab-ce!27148
| * | | | | | | | | | | | | | | | | Update auth with registry docsEvan Read2019-04-091-17/+18
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '46326-environment-url-validation' into 'master'Kamil Trzciński2019-04-092-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment url validation Closes #46326 See merge request gitlab-org/gitlab-ce!26805
| * | | | | | | | | | | | | | | | | Add environment url validationWolphin2019-04-092-0/+42
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-093-9/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create pipelines for merge requests **only** when source branch is updated See merge request gitlab-org/gitlab-ce!26921
| * | | | | | | | | | | | | | | | | Prevent triggering pipelines when target branch is updatedprevent-running-mr-pipelines-when-target-updatedShinya Maeda2019-04-083-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, pipelines for merge requests are triggered when source or target branch is updated. However, we should create only when source branch is updated, because it runs unexpected pipelines.
* | | | | | | | | | | | | | | | | | Merge branch '30157-api-expose-single-environment' into 'master'Kamil Trzciński2019-04-0911-4/+322
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint to expose single environment Closes #30157 See merge request gitlab-org/gitlab-ce!26887
| * | | | | | | | | | | | | | | | | | Add new API endpoint to expose single environmentKrasimir Angelov2019-04-0911-4/+322
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157. Implement new API endpoint `/projects/:id/environments/:environment_id` to expose single environment. Include information for environment's last deployment if there is one.
* | | | | | | | | | | | | | | | | | Merge branch 'winh-jest-no-jasmine-globals' into 'master'Kushal Pandya2019-04-097-13/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ESLint rule jest/no-jasmine-globals See merge request gitlab-org/gitlab-ce!27137