summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-311-1/+1
|\
| * remove Ability.abilitieshttp://jneen.net/2016-08-301-1/+1
* | Merge branch 'remove-fishy-smell' into 'master' Douwe Maan2016-08-311-2/+2
|\ \ | |/ |/|
| * Allow setting branch refs for MRremove-fishy-smellSean McGivern2016-08-251-2/+2
* | Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-301-1/+3
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-261-21/+46
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-191-0/+26
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-181-2/+35
| |\ \ \
| * | | | An empty line after guard, feedback:Lin Jen-Shin2016-08-161-0/+1
| * | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-161-0/+9
| |\ \ \ \
| * | | | | Reverse ref and sha in args and rename pipeline to pipeline_forLin Jen-Shin2016-08-111-1/+2
* | | | | | Change method nameKatarzyna Kobierska2016-08-301-3/+3
* | | | | | Improve grammar and fix CHANGELOGKatarzyna Kobierska2016-08-301-1/+1
* | | | | | User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-15/+18
| |_|_|_|/ |/| | | |
* | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-2/+6
|\ \ \ \ \
| * | | | | Don't show conflicts when there are noneSean McGivern2016-08-251-1/+5
| * | | | | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-1/+1
| | |_|_|/ | |/| | |
* | | | | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-221-15/+16
* | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-191-2/+69
|\ \ \ \ \ | |/ / / /
| * | | | Improve performance of MR show pageDouwe Maan2016-08-181-1/+1
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-2/+35
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'mc-ui'Douwe Maan2016-08-171-2/+24
| | |\ \ \
| | | * \ \ Merge branch 'master' into mc-uiDouwe Maan2016-08-151-0/+8
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-0/+5
| | | * | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-5/+7
| | | * | | Don't allow resolving invalid conflictsSean McGivern2016-08-121-4/+19
| | | * | | Fix merge conflict reading for new diffsSean McGivern2016-08-121-2/+2
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-161-5/+37
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Properly select a list of Pipelines for a Merge RequestsKamil Trzcinski2016-08-121-0/+11
| * | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-171-4/+11
| * | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-0/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-151-0/+8
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-121-1/+3
| | | * | | Incorporate feedbackZ.J. van de Weg2016-08-111-1/+1
| | | * | | Show deployment status on a MR viewZ.J. van de Weg2016-08-111-0/+6
| | | | |/ | | | |/|
| * | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-0/+1
| |\ \ \ \ | | |/ / /
| * | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-121-0/+4
| * | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-031-5/+28
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use correct user for 'Discussion resolved by...'Douwe Maan2016-07-281-3/+6
| * | | | Add 'Resolved all discussions' system noteDouwe Maan2016-07-281-0/+5
| * | | | Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-251-0/+7
| | |_|/ | |/| |
* | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-15/+2
* | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-3/+3
* | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-151-3/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | api for generating new merge requestScott Le2016-08-111-0/+1
| | |/ | |/|
| * | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-031-1/+1
| * | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
| * | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-4/+4
| * | Introduce Compare model in the codebase.Paco Guzman2016-08-031-2/+6
| * | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-0/+4
View Lorry Controller Status