summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_55024' into 'master'Nick Thomas2018-12-141-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
* | Don't build project services unneccesarilyBrett Walker2018-10-041-9/+19
|/
* Fix mention in edit mrAlin Ciciu2018-09-121-0/+14
* Squashed commit of the following:Shinya Maeda2018-08-071-0/+24
* Fix merge request controller spec because to as_jsonShinya Maeda2018-08-031-1/+1
* Squashed commit of the following:Shinya Maeda2018-08-021-0/+58
* Render MR page when no persisted diff_refs or diffs sizeOswaldo Ferreira2018-07-181-0/+17
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})...Jasper Maes2018-06-191-1/+6
* Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-151-1/+1
* Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-1/+1
|\
| * remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-051-1/+1
* | Add missing tests around rendering invalid merge requests (HTML+JSON)Ash McKenzie2018-06-061-0/+20
|/
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-2/+21
* Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+58
* Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-0/+8
* Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-181-1/+1
|\
| * Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-181-1/+1
* | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-4/+4
|/
* Check if head_pipeline is correct before mergingFelipe Artur2017-12-051-4/+16
* Refactor issuable destroy actionJarka Kadlecova2017-11-061-1/+1
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-27/+29
* Load participants asyncEric Eastwood2017-10-311-3/+3
* Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-201-7/+7
* Add a project forks spec helperBob Van Landuyt2017-10-071-12/+6
* Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-12/+0
|\
| * Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-12/+0
* | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-031-1/+1
|/
* add controller specmicael.bergeron2017-09-061-0/+22
* Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'Rémy Coutable2017-08-021-1/+3
|\
| * Make the 'issuables list meta-data' shared example less dangerousrs-issuables-list-metadata-shared-examplesRobert Speicher2017-08-011-1/+3
* | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-011-4/+4
|/
* Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-011-1/+1
* Remove unnecessary set_flash.now from controller specsDmitriy Zaporozhets2017-07-241-1/+1
* Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-141-1/+2
View Lorry Controller Status