diff options
| author | basyura <basyura@gmail.com> | 2016-11-25 23:09:50 +0900 |
|---|---|---|
| committer | basyura <basyura@gmail.com> | 2016-12-05 22:02:45 +0900 |
| commit | 3ce2ba1afb1dad707e1e3ac2bb5ff856d06f621e (patch) | |
| tree | 5e02c245c190a0110834a9ea4c7d540ce0aef9d5 /app/assets | |
| parent | 024ca242b4cdb6f64abb0148952796967d13104b (diff) | |
| download | gitlab-ce-3ce2ba1afb1dad707e1e3ac2bb5ff856d06f621e.tar.gz | |
fix display hook error message
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
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); |