summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-201-1/+1
* Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-1/+1
* Use present? instead of presence on Projects::MergeRequestsControllerDouglas Barbosa Alexandre2016-10-191-1/+4
* Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-191-1/+0
* List group labels on project labels pageDouglas Barbosa Alexandre2016-10-191-1/+1
* Allow users to apply group labels on Issues/MRsDouglas Barbosa Alexandre2016-10-191-1/+4
* Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-6/+13
|\
| * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-5/+13
| * Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-181-2/+2
| * Remove obsolete variable assigned to MR widget viewGrzegorz Bizon2016-10-181-1/+0
* | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-5/+15
|\ \ | |/
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-1/+25
| |\
| * | Allow setting content for resolutionsSean McGivern2016-10-131-5/+15
* | | Fix remaining specs failuresKamil Trzcinski2016-10-181-1/+6
* | | Refactor code to use available and stopped statuses and refactor views to use...Kamil Trzcinski2016-10-171-1/+1
* | | Add environment stop action [ci skip]Kamil Trzcinski2016-10-171-0/+1
| |/ |/|
* | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-1/+2
* | Minor style improvementZ.J. van de Weg2016-10-141-14/+6
* | Rename method in testZ.J. van de Weg2016-10-141-18/+23
* | Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-141-18/+20
* | Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-141-25/+20
* | Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-1/+30
|/
* Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-111-1/+22
|\
| * fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-0/+2
| * Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-1/+20
* | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-23/+43
|/
* Add a /wip slash commandThomas Balthazar2016-10-031-1/+1
* Change callbackKatarzyna Kobierska2016-09-301-1/+1
* Callback close_merge_request_without_source_projectKatarzyna Kobierska2016-09-301-7/+8
View Lorry Controller Status