summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-231-0/+12
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-191-2/+8
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-091-137/+97
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+1
* Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-211-2/+0
* Review changes, used eq instead of matchuse-favicon-full-path-for-pipeline-status-faviconLuke "Jared" Bennett2017-04-171-1/+1
* Updated specsLuke "Jared" Bennett2017-04-131-1/+1
* Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-061-0/+12
|\
| * Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-051-0/+12
* | Satisfy RubocopDouwe Maan2017-04-051-1/+1
* | Add option to start a new discussion on an MRDouwe Maan2017-04-051-1/+1
|/
* Use detailed_status effectively. Remove unnecesarry context(nest). Add new co...Shinya Maeda2017-03-231-13/+24
* Rename endpoints 'status' to 'pipeline_status' in merge_requestsShinya Maeda2017-03-231-6/+6
* Add more specsShinya Maeda2017-03-231-0/+3
* Fix rspec failureShinya Maeda2017-03-231-2/+6
* 3 lines to One line. Correct spec caption.Shinya Maeda2017-03-231-1/+1
* Fix rubocop angerShinya Maeda2017-03-231-6/+6
* Add controllers specShinya Maeda2017-03-231-0/+20
* Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-201-0/+18
* Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-17/+17
|\
| * Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-17/+17
* | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-1/+2
|/
* Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-271-0/+2
|\
| * Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-241-0/+2
* | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-34/+34
* | Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
* | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-12/+12
* | Enable Style/WordArrayDouwe Maan2017-02-231-1/+1
* | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-231-1/+2
* | Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-12/+12
* | Enable Style/DotPositionDouwe Maan2017-02-231-3/+3
|/
* Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+3
* Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-091-0/+4
* Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-apiGrzegorz Bizon2017-02-071-1/+7
* Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-031-8/+1
* Add basic specs for new merge requests pipelines APIGrzegorz Bizon2017-02-031-11/+23
* Use ApiHelpers in merge request specs for API routesfeature/gb/expose-commit-and-mr-pipelines-apiGrzegorz Bizon2017-01-301-11/+5
* Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+32
* Address MR commentsJarka Kadlecova2017-01-131-3/+19
* refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+52
* applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-231-4/+4
* adds specs for respective behaviourTiago Botelho2016-12-211-2/+20
* Removes builds tab from merge requestFilipa Lacerda2016-12-211-4/+0
* Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-1/+3
* Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+25
* Complete and improve specsRémy Coutable2016-11-041-14/+54
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+26
* Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+30
|\
| * Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-0/+30
View Lorry Controller Status