Commit 33aeaf6a authored by Phil Hughes's avatar Phil Hughes

Merge request title is in the notification

Short commit instead of long commit sha
parent fcba2551
...@@ -42,6 +42,8 @@ class @MergeRequestWidget ...@@ -42,6 +42,8 @@ class @MergeRequestWidget
getCIStatus: -> getCIStatus: ->
urlToCICheck = @opts.url_to_ci_check urlToCICheck = @opts.url_to_ci_check
_this = @
@fetchBuildStatusInterval = setInterval ( => @fetchBuildStatusInterval = setInterval ( =>
return if not @readyForCICheck return if not @readyForCICheck
...@@ -55,6 +57,7 @@ class @MergeRequestWidget ...@@ -55,6 +57,7 @@ class @MergeRequestWidget
if data.status isnt @opts.current_status if data.status isnt @opts.current_status
message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status)) message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status))
message = message.replace('{{sha}}', data.sha) message = message.replace('{{sha}}', data.sha)
message = message.replace('{{title}}', data.title)
notify( notify(
"Build #{_this.ciLabelForStatus(data.status)}", "Build #{_this.ciLabelForStatus(data.status)}",
...@@ -62,7 +65,7 @@ class @MergeRequestWidget ...@@ -62,7 +65,7 @@ class @MergeRequestWidget
@opts.gitlab_icon, @opts.gitlab_icon,
-> ->
@close() @close()
Turbolinks.visit "#{window.location.pathname}/builds" Turbolinks.visit _this.opts.builds_path
) )
@opts.current_status = data.status @opts.current_status = data.status
......
...@@ -233,7 +233,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -233,7 +233,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end end
response = { response = {
sha: merge_request.last_commit.sha, title: merge_request.title,
sha: merge_request.last_commit_short_sha,
status: status, status: status,
coverage: coverage coverage: coverage
} }
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
gitlab_icon: "#{asset_path 'gitlab_logo.png'}", gitlab_icon: "#{asset_path 'gitlab_logo.png'}",
current_status: "", current_status: "",
ci_message: "Build {{status}} for {{sha}}" ci_message: "Build {{status}} for {{title}}\n{{sha}}",
builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}"
}; };
if(typeof merge_request_widget === 'undefined') { if(typeof merge_request_widget === 'undefined') {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment