diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-30 15:38:25 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-31 14:37:18 +0000 |
| commit | c87a745918741b9d865022872d7d8fd98a02943d (patch) | |
| tree | 5947486b9a0040b6bfc3eb03d11f9a3a4ff5bd35 | |
| parent | 83711c784db6403234e7bc48b3a6dafef4c10465 (diff) | |
| download | gitlab-ce-27080-environment-links-not-shown-in-mr-widget-specs.tar.gz | |
Fixed issue where mr widget body reference is broken27080-environment-links-not-shown-in-mr-widget-specs27080-environment-links-not-shown-in-mr-widget
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 7cc319e2f4e..807c853ad5c 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -41,7 +41,6 @@ // ci_status_url - String, URL to use to check CI status // this.opts = opts; - this.$widgetBody = $('.mr-widget-body'); $('#modal_merge_info').modal({ show: false }); @@ -106,7 +105,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 $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>"); } else { callback = function() { return merge_request_widget.mergeInProgress(deleteSourceBranch); @@ -208,7 +207,7 @@ environment.ci_success_icon = this.$ciSuccessIcon; const templateString = _.unescape($template[0].outerHTML); const template = _.template(templateString)(environment); - this.$widgetBody.before(template); + $('.mr-widget-body').before(template); } }; |