diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-18 00:23:10 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-18 00:23:10 +0300 |
commit | 31c28f219ccd369803def2be819e862f2c65f103 (patch) | |
tree | 3e02a119b8d421be9c79bf88dc4d39fa06e0c460 /app | |
parent | 3a1cfe364f7409b78f44b3886c23dcbceb7de1fe (diff) |
Fix badly solved conflicts
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/merge_request.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index 2cbf55a8175..f38fa5c9471 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -111,7 +111,7 @@ MergeRequest.prototype.initCommitMessageListeners = function() { }); }; -MergeRequest.updateStatusText = function() { +MergeRequest.setStatusBoxToMerged = function() { $('.detail-page-header .status-box') .removeClass('status-box-open') .addClass('status-box-mr-merged') @@ -129,6 +129,7 @@ MergeRequest.decreaseCounter = function(by = 1) { MergeRequest.hideCloseButton = function() { const el = document.querySelector('.merge-request .js-issuable-actions'); const closeDropdownItem = el.querySelector('li.close-item'); + if (closeDropdownItem) { closeDropdownItem.classList.add('hidden'); // Selects the next dropdown item diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 60f42c46ffe..f16414ad5c0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -166,7 +166,7 @@ export default { // If state is merged we should update the widget and stop the polling eventHub.$emit('MRWidgetUpdateRequested'); eventHub.$emit('FetchActionsContent'); - MergeRequest.updateStatusText('status-box-open', 'status-box-merged', 'Merged'); + MergeRequest.setStatusBoxToMerged(); MergeRequest.hideCloseButton(); MergeRequest.decreaseCounter(); stopPolling(); |