summaryrefslogtreecommitdiff
path: root/app/models/merge_request.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/+9
* post merge pipeline and environments statusAlessio Caiazza2018-10-291-0/+6
* #13650 added wip search functionality and testsChantal Rollison2018-10-031-1/+1
* Applies the CE backport of EE#657Tiago Botelho2018-09-241-0/+1
* Added FromUnion to easily select from a UNIONYorick Peterse2018-09-171-9/+6
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+12
* Squashed commit of the following:Shinya Maeda2018-08-071-7/+12
* Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'Sean McGivern2018-08-071-11/+17
|\
| * Avoid N+1 on MRs page when metrics merging date cannot be foundOswaldo Ferreira2018-08-061-11/+17
* | Merge branch 'issue_44821' into 'master'Sean McGivern2018-08-061-3/+18
|\ \ | |/ |/|
| * Retrieve merge request closing issues from database cacheFelipe Artur2018-08-061-3/+18
* | Added unique identifier to calculate_reactive_cache. Decoupled comparison log...Shinya Maeda2018-08-031-19/+12
* | Merge branch 'master-ce' into artifact-format-v2-with-parserShinya Maeda2018-08-031-0/+2
|\ \
| * \ Merge branch 'frozen-string-enable-app-models' into 'master'Rémy Coutable2018-08-021-0/+2
| |\ \
| | * | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-261-0/+2
| | |/
* | | Simplify the query to fetch base and head pipelinesShinya Maeda2018-08-021-5/+2
* | | Squashed commit of the following:Shinya Maeda2018-08-021-0/+45
|/ /
* | Resource event modelJan Provaznik2018-08-011-0/+1
|/
* Fix notify_conflict? raising exception when branches do not existMark Chao2018-07-021-9/+11
* Notify conflict only for opened/locked merge requestsMark Chao2018-06-251-3/+5
* Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-241-12/+5
* Changes tab VUE refactoringFelipe Artur2018-06-211-0/+4
* Notify only when unmergeable due to conflictMark Chao2018-06-201-2/+11
* Revert rename allow collaboration columnMark Chao2018-06-081-1/+4
* Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-6/+6
|\
| * Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-6/+6
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-011-0/+8
|\ \ | |/
| * Ensure metrics regardless of being imported on MRs41587-osw-mr-metrics-migration-take-twoOswaldo Ferreira2018-05-301-0/+1
| * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+7
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-281-4/+25
|\ \ | |/
| * Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| * Create TODO when MR became unmergeablelulalala2018-05-171-0/+1
| * Notify with email when merge request became unmergeablelulalala2018-05-171-0/+4
| * Add MergeRequest#merge_participantslulalala2018-05-171-0/+10
| * Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-4/+10
* | Fix static analysysShinya Maeda2018-05-111-1/+1
* | Decouple to_params from AtomicInternalId concernShinya Maeda2018-05-081-0/+1
|/
* Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+4
* [Rails5] Fix params passed to MergeWorkerblackst0ne2018-05-031-1/+1
* Atomic internal ids for all modelsAndreas Brandl2018-04-201-1/+3
* Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-10/+17
* Deprecate InternalId concern and rename.Andreas Brandl2018-03-161-1/+1
* Only cache highlight results for latest MR diffsSean McGivern2018-03-151-2/+3
* Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-071-1/+1
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+18
* Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-4/+16
* Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-oneStan Hu2018-02-081-3/+5
* Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-2/+2
* Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-6/+6
* Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-1/+7
View Lorry Controller Status