summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests/application_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2023-04-041-0/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2023-01-091-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2023-01-091-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-12-151-4/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-12-141-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-03-071-0/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-05-111-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-01-281-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-10-081-0/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-10-011-0/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-09-071-0/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-07-151-6/+3
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-091-1/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+2
|
* Use MergeRequest#source_project as permissions reference for ↵drew cimino2019-07-051-1/+1
| | | | | | | | | | MergeRequest#all_pipelines MergeRequest#all_pipelines fetches Ci::Pipeline records from the source project, so we should specifically check that project for permissions. This was already happening for intra-project merge requests, but in the event that the target and source projects both have private builds, we should ensure that the project permissions are respected.
* Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-281-0/+7
| | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-orderSam Bigelow2019-06-051-3/+7
| | | | This MR is a backport of an EE merge request
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-1/+1
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Enable fast task lists for merge requestsBrett Walker2019-02-071-1/+2
| | | | Allow single tasks to be updated quickly
* [master] Pipelines section is available to unauthorized usersKamil Trzciński2019-01-311-3/+6
|
* Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
| | | | | | | | | | | | Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/**/*.rb * app/controllers/sherlock/**/*.rb * app/controllers/snippets/**/*.rb * app/controllers/users/**/*.rb Partially addresses #47424.
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Show the status of a user in interactionsBob Van Landuyt2018-07-301-1/+1
| | | | | | | | | | | | | | | The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
* Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
| | | | | | branch" "Maintainer" will be freed to be used for #42751
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+1
|
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+1
| | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
* corrects the url buildingmicael.bergeron2017-12-071-6/+0
|
* diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-071-1/+6
| | | | add a spec for commit merge request diff notes
* removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-7/+0
| | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
* Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-1/+1
| | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* Support discussion locking in the backendJarka Kadlecova2017-09-141-0/+1
|
* Revert parent param removalLuke "Jared" Bennett2017-07-071-1/+1
|
* Removed merge_request/issue state_event param parent and removed ↵Luke "Jared" Bennett2017-07-071-2/+1
| | | | issuable_path helpers in favour of issuable_url helpers
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+48
View Lorry Controller Status