summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Process at most 4 pipelines during pushlimit-amount-of-created-pipelinesKamil Trzciński2019-04-102-12/+17
| | | | | | | | This adds a limitation that we will try to create pipeline for at most 4 first changes (branches and tags). This does not affect processing of Pipelines for Merge Requests, as each updated MR will have associated pipeline created.
* Merge branch 'revert-2cc01f12' into 'master'Rémy Coutable2019-04-102-36/+9
|\ | | | | | | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195
| * Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12Stan Hu2019-04-102-36/+9
| | | | | | This reverts merge request !26481
* | Add more info logging to cluster appsDylan Griffith2019-04-104-0/+20
|/ | | | | Log events so that it's easy to see when different requests are starting.
* Fix MR assignees for push optionsNick Thomas2019-04-091-2/+2
| | | | | | | | | With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
* Merge branch ↵Robert Speicher2019-04-091-17/+23
|\ | | | | | | | | | | | | '6649-extract-ee-specific-files-lines-for-ci-cd-app-serializers' into 'master' Extract preloaded_relations See merge request gitlab-org/gitlab-ce!27168
| * Extract preloaded_relations into method6649-extract-ee-specific-files-lines-for-ci-cd-app-serializersMatija Čupić2019-04-091-17/+23
| |
* | Mark unverified pages domains for removalVladimir Shushlin2019-04-094-12/+20
| | | | | | | | | | | | | | Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
* | Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'Douglas Barbosa Alexandre2019-04-095-5/+6
|\ \ | | | | | | | | | | | | Update comments about N + 1 Gitaly calls See merge request gitlab-org/gitlab-ce!27178
| * | Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-095-5/+6
| | | | | | | | | | | | | | | To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
* | | Merge branch '60249' into 'master'Annabel Dunstone Gray2019-04-091-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix SVG icon colors in Related MRs widget Closes #60249 See merge request gitlab-org/gitlab-ce!27151
| * | | Fix icon colors of related MRs widget60249Fatih Acet2019-04-091-0/+12
| | | |
* | | | Merge branch 'do-not-reopen-merged-mr' into 'master'Mike Greiling2019-04-092-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a "reopen merge request button" on a "merged" merge request Closes #54039 See merge request gitlab-org/gitlab-ce!26965
| * | | | Remove a "reopen merge request button" on a "merged" merge requestHiroyuki Sato2019-04-042-3/+7
| | | | |
* | | | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-0922-10/+356
| | | | | | | | | | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | | | | Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-0960-372/+355
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * | | | | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-0860-372/+355
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | | | Add new permission model `read-pipeline-variable`Agustin Henze2019-04-092-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to get the variables via the API endpoint `/projects/:id/pipelines/:pipeline_id/variables` Signed-off-by: Agustin Henze <tin@redhat.com>
* | | | | Merge branch '10962' into 'master'Clement Ho2019-04-091-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused CSS class in Related MRs widget Closes gitlab-ee#10962 See merge request gitlab-org/gitlab-ce!27150
| * | | | | Remove unused CSS class in Related MRs widget10962Fatih Acet2019-04-091-4/+1
| |/ / / /
* | | | | Merge branch 'always-link-instance-configuration' into 'master'Fatih Acet2019-04-091-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show instance configuration link Closes #59730 See merge request gitlab-org/gitlab-ce!26783
| * | | | | Always show instance configuration linkBastian Blank2019-04-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link to the useful instance configuration page was hidden behind the commercial content setting. Just display it always.
* | | | | | Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-094-3/+165
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
| * | | | | | Update service to handle unexpected exceptions43263-git-push-option-to-create-mrLuke Duncalfe2019-04-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure that now and in the future, PushOptionsHandlerService will not cause the post_receive API endpoint from running other code if something causes an unknown exception.
| * | | | | | Refactor PushOptionsHandlerService from reviewLuke Duncalfe2019-04-091-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exceptions are no longer raised, instead all errors encountered are added to the errors property. MergeRequests::BuildService is used to generate attributes of a new merge request. Code moved from Api::Internal to Api::Helpers::InternalHelpers.
| * | | | | | Support merge on pipeline success w/ push optionsLuke Duncalfe2019-04-091-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `merge_when_pipeline_succeeds` set using git push options. To create a new merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.create \ -o merge_request.merge_when_pipeline_succeeds To update an existing merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.merge_when_pipeline_succeeds Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | | | | | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Support merge request create with push optionsLuke Duncalfe2019-04-091-0/+127
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 '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 '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
| | | | | | | |
* | | | | | | | Resolve Environments#additional_metrics TypeError, ensure unix formatSarah Yasonik2019-04-093-14/+11
| | | | | | | |
* | | | | | | | Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-094-6/+52
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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-053-8/+22
| | | | | | | |
| * | | | | | | Update the project statistics immediatellyHiroyuki Sato2019-04-051-0/+7
| | | | | | | |
| * | | | | | | Refactor project_cache_worker_keyHiroyuki Sato2019-04-051-1/+1
| | | | | | | |
| * | | | | | | Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-053-6/+31
| | | | | | | |
* | | | | | | | Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-091-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Phil Hughes2019-04-092-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master' CE backport: Move EE differences for `app/views/admin/users/show.html.haml` Closes gitlab-ee#6099 See merge request gitlab-org/gitlab-ce!26874
| * | | | | | | | | CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-hamlDennis Tang2019-04-092-1/+8
| | | | | | | | | |
* | | | | | | | | | Adds a vendors folder for third party CSSFilipa Lacerda2019-04-093-91/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not run stylelint for the vendors folder
* | | | | | | | | | Merge branch 'note-body-ee-differences' into 'master'Filipa Lacerda2019-04-092-3/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed EE differences in note_body.vue Closes gitlab-ee#9968 See merge request gitlab-org/gitlab-ce!27126
| * | | | | | | | | | Fixed EE differences in note_body.vuePhil Hughes2019-04-082-3/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'winh-filtered_search_boards' into 'master'Phil Hughes2019-04-091-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific changes from FilteredSearchBoards (CE-backport) See merge request gitlab-org/gitlab-ce!27122
| * | | | | | | | | | Remove EE-specific changes from FilteredSearchBoardswinh-filtered_search_boardsWinnie Hellmann2019-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 250c9b9ecfc35b6b828f6e1a471a803f74daf7f2)
* | | | | | | | | | | Merge branch 'revert-e4b2c3b0' into 'master'Stan Hu2019-04-091-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" Closes #60217 See merge request gitlab-org/gitlab-ce!26066
View Lorry Controller Status