diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-17 21:23:10 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-17 21:23:10 +0000 |
commit | 31c28f219ccd369803def2be819e862f2c65f103 (patch) | |
tree | 3e02a119b8d421be9c79bf88dc4d39fa06e0c460 | |
parent | 3a1cfe364f7409b78f44b3886c23dcbceb7de1fe (diff) | |
download | gitlab-ce-31c28f219ccd369803def2be819e862f2c65f103.tar.gz |
Fix badly solved conflicts10-4-stable-prepare-rc7
3 files changed, 4 insertions, 3 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(); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 11858e45386..9230b5874df 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -404,7 +404,7 @@ describe('MRWidgetReadyToMerge', () => { setTimeout(() => { const statusBox = document.querySelector('.status-box'); - expect(statusBox.classList.contains('status-box-merged')).toBeTruthy(); + expect(statusBox.classList.contains('status-box-mr-merged')).toBeTruthy(); expect(statusBox.textContent).toContain('Merged'); done(); |