summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'Marin Jankovski2018-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
* Merge branch 'remove-mr-diff-serialised-columns' into 'master'Yorick Peterse2017-11-291-22/+12
|\
| * Remove serialised diff and commit columnsSean McGivern2017-11-281-22/+12
* | Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-ha...Rémy Coutable2017-11-281-3/+15
|\ \ | |/ |/|
| * Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-3/+15
* | Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-251-1/+0
|/
* Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-241-0/+6
|\
| * Fix WIP system note not being createdissue_40374Felipe Artur2017-11-231-0/+6
* | Use latest_merge_request_diff associationSean McGivern2017-11-231-0/+37
|/
* Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-111-4/+0
* Fix another timeout when searching for pipelinesSean McGivern2017-11-101-1/+13
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-1/+1
|\
| * Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-081-1/+1
* | Refactor issuables index actionsJarka Kadlecova2017-11-071-2/+0
|/
* ignore the column before the migrationmicael.bergeron2017-11-061-1/+2
* removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-24/+3
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-0/+3
* Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canc...Yorick Peterse2017-10-301-1/+1
|\
| * Avoid hitting statement timeout finding MR pipelines39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeoutSean McGivern2017-10-271-1/+1
* | Move locked check to a guard-clauseOswaldo Ferreira2017-10-301-1/+3
* | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-1/+3
|/
* Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-1/+1
* Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+1
View Lorry Controller Status