summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Use NotesFinder in IssuableActions modulePatrick Derichs2019-08-011-0/+16
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-291-4/+94
|\
| * Merge branch 'security-mr-pipeline-permissions' into 'master'GitLab Release Tools Bot2019-07-261-4/+94
| |\
| | * Use MergeRequest#source_project as permissions reference for MergeRequest#all...drew cimino2019-07-051-4/+94
* | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'mast...Stan Hu2019-07-271-16/+0
* | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-07-261-0/+16
|\ \ \
| * | | Use NotesFinder in module IssuableActionsPatrick Derichs2019-07-261-0/+16
| |/ /
* | | Removes potentially incorrect, and slow fallbackremove_deployment_metrics_deployment_platform_fallbackThong Kuah2019-07-251-3/+2
|/ /
* | Cleanup usages of `JSON.parse` in specsPeter Leitzen2019-07-161-3/+1
* | Resolve Gitaly N+1 for CI/CD environments statusesGrzegorz Bizon2019-07-101-2/+2
* | Add additional test case for Gitaly N+1 for diff filesGrzegorz Bizon2019-07-101-36/+65
* | Add a test for `ci_environments_status` Gitaly N+1Grzegorz Bizon2019-07-101-16/+34
* | Add retry:0 for controller specs n+163475-fix-n-1Thong Kuah2019-07-081-1/+1
* | Restore fallback to deployment_platform_clusterThong Kuah2019-07-081-3/+4
* | Could not address last 5 queriesThong Kuah2019-07-081-1/+4
* | Add failing test showing N+1Thong Kuah2019-07-081-0/+12
|/
* Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussionsStan Hu2019-06-221-0/+2
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-1/+25
* Abstract auto merge processesShinya Maeda2019-06-031-8/+10
* Add some frozen string to spec/**/*.rbgfyoung2019-04-151-0/+2
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-3/+3
* Fix and expand Gitaly FindCommit cachingsh-fix-ref-name-cachingStan Hu2019-04-041-0/+2
* Allow ref name caching CommitService#find_commitStan Hu2019-03-271-0/+4
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-0/+17
* Re-enable MethodCallWithoutArgsParentheses CopAndrew Newdigate2019-01-291-1/+1
* Save sorting preference for Issues/MRs in BEMario de la Ossa2019-01-281-1/+3
* Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-3/+3
* [EE Backport] Add notes filters for epicsFelipe Artur2019-01-141-0/+1
* Fix deprecation: Using positional arguments in integration testsJasper Maes2019-01-021-4/+4
* Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-271-0/+64
|\
| * Cache diff highlight in discussionsOswaldo Ferreira2018-12-211-0/+64
* | Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-211-15/+0
|\ \ | |/ |/|
| * Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-15/+0
* | Remove deprecated xhr from specsJasper Maes2018-12-191-7/+9
|/
* Update specs to rails5 formatblackst0ne-convert-specs-rails5-styleblackst0ne2018-12-191-50/+73
* Remove rails4 specific codeJasper Maes2018-12-161-5/+1
* Do not save user preferences on read-only modeFelipe Artur2018-12-121-0/+2
* Inline the new checks into normal update error handlingNick Thomas2018-12-071-3/+5
* Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-1/+1
* Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-0/+12
* Squashed commit of the following:Shinya Maeda2018-11-061-2/+2
* Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-021-0/+1
|\
| * Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-311-0/+1
* | Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
|/
* post merge pipeline and environments statusAlessio Caiazza2018-10-291-8/+43
* Resolve "Filter discussion (tab) by comments or activity in issues and merge ...Oswaldo Ferreira2018-10-231-0/+8
* Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-4/+6
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-22/+0
|\
| * Remove dead code on main MR pageOswaldo Ferreira2018-10-051-22/+0
* | Update spec comment to point to correct issueBrett Walker2018-10-051-1/+1
View Lorry Controller Status