summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookupStan Hu2018-11-021-0/+26
* Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-021-2/+2
|\
| * Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-serviceStan Hu2018-11-011-2/+2
* | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-0/+14
|/
* post merge pipeline and environments statusAlessio Caiazza2018-10-291-0/+20
* #13650 added wip search functionality and testsChantal Rollison2018-10-031-1/+1
* Whitelist existing destroy_all offensesblacklist-destroy-allYorick Peterse2018-08-161-1/+1
* Squashed commit of the following:Shinya Maeda2018-08-071-1/+12
* Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'Sean McGivern2018-08-071-0/+67
|\
| * Avoid N+1 on MRs page when metrics merging date cannot be foundOswaldo Ferreira2018-08-061-0/+67
* | Merge branch 'issue_44821' into 'master'Sean McGivern2018-08-061-3/+69
|\ \ | |/ |/|
| * Retrieve merge request closing issues from database cacheFelipe Artur2018-08-061-3/+69
* | Remove binding.pryShinya Maeda2018-08-041-1/+0
* | Wraps lines which over 80 charsShinya Maeda2018-08-031-1/+6
* | Add factory for parsers. Add required specification in json schema matcher. I...Shinya Maeda2018-08-031-20/+17
* | Added unique identifier to calculate_reactive_cache. Decoupled comparison log...Shinya Maeda2018-08-031-12/+7
* | Squashed commit of the following:Shinya Maeda2018-08-021-0/+105
|/
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-111-4/+4
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Fix notify_conflict? raising exception when branches do not existMark Chao2018-07-021-0/+16
* Notify conflict only for opened/locked merge requestsMark Chao2018-06-251-22/+40
* Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-241-19/+8
* Notify only when unmergeable due to conflictMark Chao2018-06-201-2/+14
* Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-051-2/+10
* Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-14/+14
|\
| * Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-14/+14
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-011-0/+59
|\ \ | |/
| * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+59
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-281-22/+116
|\ \ | |/
| * Add specMark Chao2018-05-241-22/+34
| * Add MergeRequest#merge_participantslulalala2018-05-171-0/+35
| * Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-0/+47
* | Clarify scope for AtomicInternalId shared specShinya Maeda2018-05-141-0/+1
|/
* Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+16
* [Rails5] Fix params passed to MergeWorkerblackst0ne2018-05-031-1/+1
* Atomic internal ids for all modelsAndreas Brandl2018-04-201-1/+7
* Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-0/+11
* Deprecate InternalId concern and rename.Andreas Brandl2018-03-161-1/+1
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-1/+1
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+78
* Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-0/+4
* Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-1/+1
* Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-10/+20
* Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-2/+12
* Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-0/+33
* Merge branch '41807-15665-consistently-502s-because-it-fetches-every-commit' ...41988-updating-the-markdown-cache-version-does-not-flush-the-appearances-cacheRémy Coutable2018-01-121-0/+77
|\
| * Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commitSean McGivern2018-01-121-0/+77
* | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-23/+29
|\ \
| * | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-23/+29
| |/
* | Remove soft removals related codeYorick Peterse2018-01-081-5/+0
|/