summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...14202-speed-up-diff-note-activePaco Guzman2016-08-011-0/+2
* State specific default sort order for issuableszs2016-08-011-1/+2
* Reduce number of queries made for merge_requests/:id/diffsfix/use-fewer-queries-for-mr-notesAhmad Sherif2016-07-281-1/+1
* Incorporate review commentsStan Hu2016-07-261-1/+1
* Optimize maximum user access level lookup in loading of notesStan Hu2016-07-261-0/+3
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-4/+4
* Address feedback.Connor Shea2016-07-191-1/+1
* Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-191-0/+2
* Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-4/+1
* Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-121-1/+4
* Be explicit on merge request discussion variablesPaco Guzman2016-07-121-10/+15
* Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-28/+32
|\
| * Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-6/+0
| |\
| | * Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-6/+0
| * | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-081-22/+32
* | | DRY up diff_for_path actionsSean McGivern2016-07-081-3/+3
* | | Collapse large diffs by defaultSean McGivern2016-07-081-23/+53
|/ /
* | Add send_git_patch helperDouwe Maan2016-07-061-6/+9
* | Support new diff notes on MRs with diff_refsDouwe Maan2016-07-061-0/+1
* | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-11/+7
|/
* Workhorse to serve email diffsZ.J. van de Weg2016-06-281-1/+7
* Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-1/+8
* Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-2/+24
* Merge branch 'zj-pipeline-can-be-nil'Douwe Maan2016-06-231-2/+7
|\
| * Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-231-2/+7
* | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-231-2/+2
|/
* Rename ci_commit to pipeline18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-buildZ.J. van de Weg2016-06-151-5/+5
* Fix race condition on auto mergeZeger-Jan van de Weg2016-06-151-3/+12
* Add send_git_diff helperDouwe Maan2016-06-081-14/+18
|\
| * Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-3/+10
| |\
| | * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-3/+10
| * | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
| * | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| * | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-2/+4
| |\ \ | |/ / |/| |
| * | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-061-1/+1
| * | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-031-0/+5
| |\ \ | | |/
| * | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-11/+11
* | | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-1/+6
|\ \ \ | | |/ | |/|
| * | Don't allow merges with new commitsSean McGivern2016-06-011-0/+5
| |/
| * Add leading comment space copissue_15557Felipe Artur2016-05-311-1/+1
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-301-2/+2
|\ \ | |/
| * Fixed issue with button color when no CI enabledmerge-button-color-fixPhil Hughes2016-05-251-2/+2
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-1/+2
|\ \ | |/
| * Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+2
* | Fix backend merge mistakesZJ van de Weg2016-05-191-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-2/+3
|\ \ | |/
| * Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-131-1/+1
| * Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-3/+4
* | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-4/+5
|\ \ | |/
| * Fixed issue with assignee object not being returnedPhil Hughes2016-04-221-1/+1
View Lorry Controller Status