summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-16 14:52:56 +0000
committerPhil Hughes <me@iamphill.com>2016-03-18 10:26:48 +0000
commit33aeaf6a9c926d269f090f3e4a9c048661b8078e (patch)
tree1e453136156e25bb0e0eeebd27505319d6c4cf7b /app/controllers/projects
parentfcba25515321f57e36b9a8f2156d6b72eafb4c14 (diff)
downloadgitlab-ce-33aeaf6a9c926d269f090f3e4a9c048661b8078e.tar.gz
Merge request title is in the notification
Short commit instead of long commit sha
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2cc94596d2b..728d743045f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -233,7 +233,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
response = {
- sha: merge_request.last_commit.sha,
+ title: merge_request.title,
+ sha: merge_request.last_commit_short_sha,
status: status,
coverage: coverage
}