summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests
Commit message (Collapse)AuthorAgeFilesLines
* Update specs to rails5 formatblackst0ne-convert-specs-rails5-styleblackst0ne2018-12-193-33/+45
| | | | | | | | | | Updates specs to use new rails5 format. The old format: `get :show, { some: params }, { some: headers }` The new format: `get :show, params: { some: params }, headers: { some: headers }`
* Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-041-0/+12
|
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+0
| | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-221-0/+49
| | | | | | | When a diff has a significant number of commits, the previous behavior would attempt to render the Markdown on all the commit messages but only display 1000 of them. To avoid additional work, we only need to render the Markdown on the set that is displayed.
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-112-3/+3
|
* Changes tab VUE refactoringFelipe Artur2018-06-211-20/+9
|
* Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | First, transitions between can_be_merged & cannot_be_merged are removed, as they are currently blocked in `check_if_can_be_merged`. `can_be_merge` always returns to `unchecked` first, before it can transition to `cannot_be_merged` (and vice versa). We want to avoid repeated notification triggered by repeated transition between `cannot_be_merged` & `unchecked`. So we added `cannot_be_merged_recheck` state, similar to `unchecked`, but as a mean to remember it’s from cannot_be_merged. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407 Since `unchecked` and `cannot_be_merged_recheck` both mean “we are in the middle of checking if it is mergeable”, quite often we need to see if merge_status is in either one of them, so `check_state?` is added to achieve this.
* Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-30/+0
|
* Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-1/+63
|
* Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-151-17/+25
|
* Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-3/+3
|
* adding view and feature specsmicael.bergeron2017-12-071-1/+2
|
* Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-203-13/+13
|
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-4/+4
| | | | Rename classes to (hopefully) clearer names while we're doing that.
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-4/+4
| | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* Add a project forks spec helperBob Van Landuyt2017-10-071-4/+6
| | | | | The helper creates a fork of a project with all provided attributes, but skipping the creation of the repository on disk.
* Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-021-1/+1
|
* Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-013-5/+5
|
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-283-0/+587