From 3ce2ba1afb1dad707e1e3ac2bb5ff856d06f621e Mon Sep 17 00:00:00 2001
From: basyura <basyura@gmail.com>
Date: Fri, 25 Nov 2016 23:09:50 +0900
Subject: fix display hook error message

---
 app/assets/javascripts/merge_request_widget.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index a55fe9df0b3..d9495e50388 100644
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -101,7 +101,7 @@
               urlSuffix = deleteSourceBranch ? '?deleted_source_branch=true' : '';
               return window.location.href = window.location.pathname + urlSuffix;
             } else if (data.merge_error) {
-              return this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
+              return _this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
             } else {
               callback = function() {
                 return merge_request_widget.mergeInProgress(deleteSourceBranch);
-- 
cgit v1.2.1