summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Add a spec for merge request metric caching while refreshing a merge request ...Timothy Andrew2016-09-211-1/+1
* Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingI...Timothy Andrew2016-09-213-12/+5
* Improve performance of the cycle analytics page.Timothy Andrew2016-09-152-0/+21
* Prepend blank line to close message on merge requestLuke Howell2016-09-011-1/+1
* Project tools visibility levelFelipe Artur2016-09-011-1/+1
* Merge branch '19315-can-edit-merge-request-with-deleted-fork' into 'master' Douwe Maan2016-08-301-0/+4
|\
| * User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-0/+4
* | Use Repository#fetch_refSean McGivern2016-08-301-2/+7
* | Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-uiSean McGivern2016-08-301-1/+15
|/
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-191-0/+10
|\
| * Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-181-1/+10
| |\
| * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-0/+31
| |\ \
| * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-1/+12
| |\ \ \
| * | | | Address review feedbackDouwe Maan2016-08-161-1/+1
| * | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-0/+52
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-035-6/+23
| |\ \ \ \ \
| * | | | | | Send notification email when all discussions are resolvedDouwe Maan2016-07-281-0/+1
| * | | | | | Add 'Resolved all discussions' system noteDouwe Maan2016-07-281-0/+9
* | | | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-183-16/+13
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-1/+1
| * | | | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-161-1/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service`Rémy Coutable2016-08-132-0/+4
| * | | | | | Support slash commands in noteable description and notesRémy Coutable2016-08-131-16/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '2451-fix-mentions-in-issue-updates' into 'master' Robert Speicher2016-08-171-1/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add notifications for new user mentions in merge requestsNick Thomas2016-08-151-1/+8
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 2451-fi...Nick Thomas2016-08-151-1/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix a 'missing keyword' error introduced in the last commitNick Thomas2016-08-151-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-151-1/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-121-1/+12
| |/ / /
* | | | Move resolving code to ResolveServiceSean McGivern2016-08-121-0/+31
|/ / /
* | | api for generating new merge requestScott Le2016-08-111-0/+52
| |/ |/|
* | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-1/+1
* | Introduce Compare model in the codebase.Paco Guzman2016-08-032-2/+2
* | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
* | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-0/+8
* | webhooks: include old revision in MR update eventsBen Boeckel2016-08-012-4/+7
* | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-1/+7
|/
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-182-2/+4
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-132-4/+2
* Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-131-1/+1
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-1/+3
* Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-081-8/+3
* Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-074-10/+8
|\
| * Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-062-3/+3
| * Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-7/+5
* | Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-061-0/+1
|/
* Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-1/+4
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-012-2/+0
* Fix auto-MR-close text from branch namefix-auto-mr-closeSean McGivern2016-06-211-1/+1
* Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-2/+2