Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-16 17:52:56 +0300
committerPhil Hughes <me@iamphill.com>2016-03-18 13:26:48 +0300
commit33aeaf6a9c926d269f090f3e4a9c048661b8078e (patch)
tree1e453136156e25bb0e0eeebd27505319d6c4cf7b /app/assets/javascripts/merge_request_widget.js.coffee
parentfcba25515321f57e36b9a8f2156d6b72eafb4c14 (diff)
Merge request title is in the notification
Short commit instead of long commit sha
Diffstat (limited to 'app/assets/javascripts/merge_request_widget.js.coffee')
-rw-r--r--app/assets/javascripts/merge_request_widget.js.coffee5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 9afb6a0ce86..b74b8c21fd5 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -42,6 +42,8 @@ class @MergeRequestWidget
getCIStatus: ->
urlToCICheck = @opts.url_to_ci_check
+ _this = @
+
@fetchBuildStatusInterval = setInterval ( =>
return if not @readyForCICheck
@@ -55,6 +57,7 @@ class @MergeRequestWidget
if data.status isnt @opts.current_status
message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status))
message = message.replace('{{sha}}', data.sha)
+ message = message.replace('{{title}}', data.title)
notify(
"Build #{_this.ciLabelForStatus(data.status)}",
@@ -62,7 +65,7 @@ class @MergeRequestWidget
@opts.gitlab_icon,
->
@close()
- Turbolinks.visit "#{window.location.pathname}/builds"
+ Turbolinks.visit _this.opts.builds_path
)
@opts.current_status = data.status