summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-1/+3
* 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-1/+10
|\
| * Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commitSean McGivern2018-01-121-1/+10
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
* | Remove soft removals related codeYorick Peterse2018-01-081-3/+2
|/
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-1/+8
* Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-1/+1
|\
| * Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-1/+1
* | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-131-3/+3
|\ \
| * | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-3/+3
| |/
* | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-131-0/+8
|\ \ | |/ |/|
| * Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-131-0/+8
* | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-121-4/+17
|/
* adding view and feature specsmicael.bergeron2017-12-071-3/+6
* revert the `#all_pipelines` method to use the pluckmicael.bergeron2017-12-071-2/+1
* add support for the commit reference filtermicael.bergeron2017-12-071-8/+13
* tidying up the changesmicael.bergeron2017-12-071-9/+0
* add support for commit (in mr) to reference filtermicael.bergeron2017-12-071-0/+9
* Throttle the number of UPDATEs triggered by touchYorick Peterse2017-12-061-0/+1
* Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-3/+3
* Check if head_pipeline is correct before mergingFelipe Artur2017-12-051-4/+8
* Improve MergeRequest#head_pipelineFelipe Artur2017-12-051-5/+1
* Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-0/+8
* We could simply count the commitsLin Jen-Shin2017-11-301-1/+2
View Lorry Controller Status