summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
...
| * with_status to only_statusShinya Maeda2017-03-231-1/+1
| * Expose only status. ci_cd_status to status. Support abstract class.Shinya Maeda2017-03-231-2/+3
| * Add api points for ci cd status. Add favicon.Shinya Maeda2017-03-231-1/+7
* | fix new MR form erroneously selects tag as source when branch of same name ex...Sanster2017-03-241-2/+2
|/
* Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-201-1/+1
* Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-12/+12
|\
| * Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-12/+12
* | Fix rubocop errorfix/gb/improve-merge-request-pipelines-apiFilipa Lacerda2017-02-281-1/+2
* | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-2/+3
|/
* Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-271-12/+11
|\
| * Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-241-12/+11
* | Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-14/+14
* | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-18/+18
* | Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-18/+18
* | Fix code for copsDouwe Maan2017-02-231-8/+9
* | Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
* | Enable Style/DotPositionDouwe Maan2017-02-231-14/+14
|/
* Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-221-1/+1
|\
| * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-211-0/+3
| |\
| * | Add merge request count to each issue on issues listblackst0ne2017-02-171-1/+1
* | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-0/+11
| |/ |/|
* | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-171-0/+3
|\ \ | |/ |/|
| * Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-141-0/+3
* | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+6
|/
* 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
View Lorry Controller Status