summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into '...Nick Thomas2018-10-291-1/+13
|\
| * Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-261-1/+13
* | post merge pipeline and environments statusAlessio Caiazza2018-10-291-3/+9
|/
* Frontend: Review app changesFilipa Lacerda2018-10-221-0/+3
* Move ci_environments_status to a modelAlessio Caiazza2018-10-181-36/+4
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-6/+0
|\
| * Remove dead code on main MR pageOswaldo Ferreira2018-10-051-6/+0
* | Don't build project services unneccesarilyBrett Walker2018-10-041-2/+2
* | Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-...Bob Van Landuyt2018-10-011-0/+4
|\ \ | |/ |/|
| * Ports new refactor from EE to CETiago Botelho2018-09-241-0/+3
| * Applies the CE backport of EE#657Tiago Botelho2018-09-241-0/+1
* | Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
|/
* Fix mention in edit mrAlin Ciciu2018-09-121-0/+1
* Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-221-1/+1
* Squashed commit of the following:Shinya Maeda2018-08-071-2/+2
* Use serializable_hash for compared resultsShinya Maeda2018-08-031-1/+1
* Set polling interval to the header in test_reports endpointShinya Maeda2018-08-021-0/+2
* Squashed commit of the following:Shinya Maeda2018-08-021-0/+15
* Support manually stopping any environment from the UIWinnie Hellmann2018-07-101-1/+1
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
View Lorry Controller Status