summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '22145-slow-search' into 'master' Yorick Peterse2017-03-241-2/+4
|\
| * simplify projects, mrs search queriesmhasbini2017-03-221-2/+4
* | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-211-1/+4
|/
* Todos performance: Include associations in FinderJarka Kadlecova2017-03-201-4/+1
* Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-141-1/+4
* Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-6/+6
* Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-4/+0
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-231-1/+1
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-9/+9
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-9/+9
| * Enable Performance/RedundantMergeDouwe Maan2017-02-231-1/+1
| * Enable Style/DotPositionDouwe Maan2017-02-231-3/+3
* | Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-231-1/+5
|/
* Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-141-2/+2
* Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-131-2/+2
* 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
|\
View Lorry Controller Status