summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-7/+3
|\
| * Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca...Dongqing Hu2017-01-311-6/+2
| * use the current_user parameter in MergeRequest#issues_mentioned_but_not_closingDongqing Hu2017-01-181-1/+1
* | Address feedbackDouwe Maan2017-02-061-7/+11
* | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-8/+2
* | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-0/+6
* | Add commment to Issue, Project and MergeRequest #to_referenceOswaldo Ferreira2017-01-271-0/+1
* | Change argument name assuming its always a ProjectOswaldo Ferreira2017-01-271-2/+2
* | Merge branch 'fix_broken_diff_discussions' into 'master' Sean McGivern2017-01-251-3/+5
|\ \
| * | Make diff discussion more reliablefix_broken_diff_discussionsValery Sizov2016-12-301-3/+5
* | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-0/+4
|\ \ \ | |_|/ |/| |
| * | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-0/+4
* | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-1/+13
* | | prevent 500 error when selecting changes tab for non-existent branchMike Greiling2017-01-031-1/+1
* | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-2/+2
| |/ |/|
* | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-5/+1
* | Use raw_diffs to calculate MR files changedSean McGivern2016-12-261-1/+3
* | Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-191-1/+1
|\ \
| * | Fix MR issue to do with merge userJames Lopez2016-12-191-1/+1
| |/
* | Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-2/+1
* | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
* | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-6/+8
* | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
* | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-161-1/+2
* | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
* | shorter lines on MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-2/+9
* | only look for issues mentioned on description on MergeRequest#issues_mentione...Gabriel Gizotti2016-12-161-2/+4
* | introduce MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-0/+16
* | Remove whole description from #merge_commit_message and add add closed issuesGabriel Gizotti2016-12-161-1/+2
|/
* Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-2/+2
* Do not reload diff for merge request made from fork when target branch in for...do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-091-1/+3
* Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-1/+1
* Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-061-0/+8
|\
| * Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-051-0/+8
* | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-021-5/+1
|/
* Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-6/+11
* Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-3/+3
* Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-1/+1
* Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-281-12/+0
|\
| * Remove event caching codeYorick Peterse2016-11-231-12/+0
* | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-231-1/+5
|/
* Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-211-1/+1
* Make commit an optional arg for environments searchGrzegorz Bizon2016-11-091-6/+9
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+7
* Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-031-2/+2
* add "x of y tasks completed" on issuableGuilherme Salazar2016-10-281-1/+0
* Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-241-2/+2
* Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-3/+3
* Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-9/+6
* Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-8/+2