summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-061-0/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-221-0/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-211-3/+10
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-161-0/+4
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-091-0/+3
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-301-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-241-0/+3
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-181-3/+3
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-161-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-161-0/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+2
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-291-1/+14
|\
| * Merge branch 'security-mr-head-pipeline-leak' into 'master'GitLab Release Tools Bot2019-08-291-1/+8
| |\
| | * Permission fix for MergeRequestsController#pipeline_statusdrew cimino2019-08-121-1/+8
| * | Merge branch 'security-ci-metrics-permissions' into 'master'GitLab Release Tools Bot2019-08-291-0/+6
| |\ \
| | * | Restrict MergeRequests#test_reports to authenticated users with read-access o...drew cimino2019-08-221-0/+6
| | |/
* | | Reduce the number of SQL requests on MR-showIgor2019-08-281-0/+1
|/ /
* | Add SortingPreference concernGeorge Koltsov2019-08-211-1/+1
|/
* Merge branch 'security-mr-pipeline-permissions' into 'master'GitLab Release Tools Bot2019-07-261-1/+2
|\
| * Use MergeRequest#source_project as permissions reference for MergeRequest#all...drew cimino2019-07-051-1/+2
* | Allow asynchronous rebase operations to be monitoredNick Thomas2019-07-041-1/+1
|/
* Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-281-6/+0
* Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-241-5/+1
|\
| * Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-201-5/+1
* | Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussionsStan Hu2019-06-221-1/+1
|/
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-3/+9
* Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-111-1/+5
* Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-031-5/+1
|\
| * Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-311-5/+1
* | Abstract auto merge processesShinya Maeda2019-06-031-29/+13
|/
* Backport changes from EEMatija Čupić2019-04-161-14/+16
* Fix and expand Gitaly FindCommit cachingsh-fix-ref-name-cachingStan Hu2019-04-041-3/+3
* Allow ref name caching CommitService#find_commitStan Hu2019-03-271-1/+3
* Remove expand diff to full file feature flagPhil Hughes2019-03-261-4/+0
* Remove diff tree filtering feature flagPhil Hughes2019-03-181-1/+0
* Add option to expand diff to full filePhil Hughes2019-03-061-0/+1
* Adds a feature flag to the diff fuzzy file finderPhil Hughes2019-02-081-0/+4
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-1/+1
* Update last_activity_on for Users on some main GET endpointsRubén Dávila2019-02-051-0/+1
* Save sorting preference for Issues/MRs in BEMario de la Ossa2019-01-281-0/+4
* Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-1/+1
* Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-271-0/+6
|\
| * Cache diff highlight in discussionsOswaldo Ferreira2018-12-211-0/+6
* | Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-4/+2
|/
* Inline the new checks into normal update error handlingNick Thomas2018-12-071-13/+8
* Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-3/+8
* Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-0/+4
* render :nothing option is deprecated, Use head method to respond with empty r...Jasper Maes2018-11-231-1/+1
* Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-121-3/+0
* Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-311-1/+2
View Lorry Controller Status