summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-141-0/+3
* Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-091-2/+5
* Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-2/+4
|\
| * Fix rendering pipelines for a new merge requestGrzegorz Bizon2017-02-071-2/+4
* | Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-4/+6
|\ \
| * | Address feedbackDouwe Maan2017-02-061-7/+3
| * | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-2/+2
| * | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-1/+7
* | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-071-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| * | Update changesKamil Trzcinski2017-02-061-1/+1
| * | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-061-2/+12
| |\ \ | | |/
| * | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-241-40/+43
| |\ \
| * | | Allow to stop any environmentKamil Trzcinski2016-11-101-1/+1
* | | | Serialize pipelines in the new merge request actionGrzegorz Bizon2017-02-031-1/+8
* | | | Moves pagination to shared folderFilipa Lacerda2017-02-031-1/+0
* | | | Use new vue js pipelines table to render in merge request viewFilipa Lacerda2017-02-031-7/+4
| |_|/ |/| |
* | | Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggeredSam Rose2017-02-011-1/+2
* | | Expose serialized pipelines API for merge requestsGrzegorz Bizon2017-01-271-1/+10
| |/ |/|
* | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+10
|\ \
| * | Address MR commentsJarka Kadlecova2017-01-131-1/+1
| * | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+10
* | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-121-4/+0
|/ /
* | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-1/+2
* | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-231-1/+1
* | adds specs for respective behaviourTiago Botelho2016-12-211-2/+4
* | Prevent empty pagination when list is not emptyTiago Botelho2016-12-211-1/+2
* | Remove builds tab from commitFilipa Lacerda2016-12-211-11/+0
* | Removes builds tab from merge requestFilipa Lacerda2016-12-211-2/+2
* | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-4/+10
|\ \
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-301-8/+10
| |\ \
| * \ \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-251-9/+6
| |\ \ \
| * | | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-4/+9
* | | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-2/+2
| |_|/ / |/| | |
* | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-7/+8
* | | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-1/+1
| |/ / |/| |
* | | Do not use MergeRequest#commits in define_pipelines_varshot-fix-define-pipeline-varsAdam Niedzielski2016-11-221-5/+2
* | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-4/+4
|\ \ \
| * | | Hide box with CI status when there are no changes in merge requestAdam Niedzielski2016-11-211-1/+1
| * | | Return valid response in Projects::MergeRequestsController#ci_status when dif...Adam Niedzielski2016-11-211-1/+1
| * | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+2
| |/ /
* | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-211-1/+1
|\ \ \ | |/ / |/| |
| * | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-181-1/+1
* | | More aggressively preload on merge request and issue index pagesDouwe Maan2016-11-181-1/+0
|/ /
* | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+1
|/
* Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-041-2/+12
|\
| * Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-021-1/+1
| |\
| * | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-241-2/+12
* | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
| |/ |/|
* | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-281-1/+1
|/
View Lorry Controller Status