summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-13/+13
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-141-15/+46
* Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-091-6/+1
* Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
* redesign caching of application settingsPaul Charlton2017-06-061-1/+1
* Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-021-1/+1
* Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-2/+5
|\
| * Use CTEs for nested groups and authorizationsYorick Peterse2017-05-171-2/+5
* | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-231-4/+3
|\ \
| * | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-4/+3
| |/
* | Handle transient MR query count spechandle-transient-mr-query-count-specOswaldo Ferreira2017-05-191-1/+1
* | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
* | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-0/+9
|/
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-2/+8
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-2/+6
|\
| * Fix specs 2Felipe Artur2017-05-081-1/+4
| * Fix SpecsFelipe Artur2017-05-081-1/+2
* | Merge request widget redesignFatih Acet2017-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
View Lorry Controller Status