summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-dev-to-master' into 'master'John Jarvis2019-03-051-5/+4
|\
| * Merge branch 'security-2773-milestones-fix' into 'master'Yorick Peterse2019-03-041-4/+3
| |\
| | * Check issue milestone availabilityJarka Košanová2019-02-141-4/+3
| * | Arbitrary file read via MergeRequestDiffFrancisco Javier López2019-03-041-1/+1
* | | Merge branch 'master' into expose-additional-merge-request-pipeline-variablesHiroyuki Sato2019-03-041-29/+21
|/ /
* | Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-0/+14
* | Merge branch 'sh-fix-issue-9787-ce' into 'master'Douwe Maan2019-02-151-3/+3
|\ \
| * | Backport commit author changes from CEStan Hu2019-02-151-3/+3
| |/
* | Base pipeline must be from target branchOlivier Gonzalez2019-02-151-1/+1
|/
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-1/+9
* Save sorting preference for Issues/MRs in BEMario de la Ossa2019-01-281-0/+2
* Merge branch 'osw-fix-quick-suggestion-application-being-reverted' into 'master'Douwe Maan2019-01-141-9/+13
|\
| * Adjust applied suggestion reverting previous changesOswaldo Ferreira2019-01-111-9/+13
* | Fix unexpected exception by failed to find an actual head pipelineShinya Maeda2019-01-101-3/+4
|/
* Add committers and authors methods on MergeRequestTiago Botelho2019-01-081-7/+17
* Make find_actual_head_pipeline private methodShinya Maeda2019-01-041-5/+7
* Refactor the logic of updating head pipelinesShinya Maeda2019-01-041-4/+14
* Prefer to use after_transitionuse-after-transitionKamil Trzciński2019-01-021-0/+2
* Cache diff highlight in discussionsOswaldo Ferreira2018-12-211-0/+22
* Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2018-12-181-2/+1
|\
| * Remove feature flag for suggest changes featureOswaldo Ferreira2018-12-181-2/+1
* | Passing an argument to force an association to reload is now deprecatedJasper Maes2018-12-181-6/+2
|/
* Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-131-0/+5
* Generalise test compare serviceGilbert Roulot2018-12-111-13/+11
* Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'm...Stan Hu2018-12-101-0/+1
* Inline the new checks into normal update error handlingNick Thomas2018-12-071-6/+17
* Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-1/+1
* Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-1/+1
* Expose merge request pipeline variablesShinya Maeda2018-12-061-0/+36
* Rename project's pipelines relationFrancisco Javier López2018-12-051-2/+2
* Merge request pipelinesShinya Maeda2018-12-051-3/+9
* Strictly require a pipeline to mergeMatija Čupić2018-11-081-1/+0
* Allow getting all paths (old & new) involved in MRMark Chao2018-11-071-0/+12
* 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
|/ /