summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-597/+11
* 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