diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-29 09:13:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-29 09:13:28 +0000 |
commit | dc90e040b1da4c089e90b21809a325d67ab2c5cb (patch) | |
tree | c894e6d6e008562db76151beb771a8c3ae3260ca /app | |
parent | 6a4f265c940d3d0a9aeacf09222920d7d2cc4e45 (diff) | |
download | gitlab-ce-dc90e040b1da4c089e90b21809a325d67ab2c5cb.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/issue.js | 10 | ||||
-rw-r--r-- | app/models/concerns/cache_markdown_field.rb | 2 | ||||
-rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/issuable/_close_reopen_report_toggle.html.haml | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 29bb6eff1b2..4b53225e100 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -89,9 +89,10 @@ export default class Issue { initIssueBtnEventListeners() { const issueFailMessage = __('Unable to update this issue at this time.'); - return $(document).on( + // NOTE: data attribute seems unnecessary but is actually necessary + return $('.js-issuable-buttons[data-action="close-reopen"]').on( 'click', - '.js-issuable-actions a.btn-close, .js-issuable-actions a.btn-reopen, a.btn-close-anyway', + 'a.btn-close, a.btn-reopen, a.btn-close-anyway', e => { e.preventDefault(); e.stopImmediatePropagation(); @@ -108,10 +109,7 @@ export default class Issue { } else { this.disableCloseReopenButton($button); - const url = $button.data('close-reopen-url'); - if (!url) { - return; - } + const url = $button.attr('href'); return axios .put(url) diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb index e4e0f55d5f4..04eb4659469 100644 --- a/app/models/concerns/cache_markdown_field.rb +++ b/app/models/concerns/cache_markdown_field.rb @@ -102,7 +102,7 @@ module CacheMarkdownField def updated_cached_html_for(markdown_field) return unless cached_markdown_fields.markdown_fields.include?(markdown_field) - refresh_markdown_cache if attribute_invalidated?(cached_markdown_fields.html_field(markdown_field)) + refresh_markdown_cache! if attribute_invalidated?(cached_markdown_fields.html_field(markdown_field)) cached_html_for(markdown_field) end diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index c8ffa2e3720..525eb4b90c1 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -32,7 +32,7 @@ %a.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" } = icon('angle-double-left') - .detail-page-header-actions.js-issuable-actions + .detail-page-header-actions.js-issuable-actions.js-issuable-buttons{ data: { "action": "close-reopen" } } .clearfix.issue-btn-group.dropdown %button.btn.btn-default.float-left.d-md-none.d-lg-none.d-xl-none{ type: "button", data: { toggle: "dropdown" } } Options diff --git a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml index 8575a61aae8..9d718083d2d 100644 --- a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml +++ b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml @@ -11,7 +11,7 @@ .float-left.btn-group.prepend-left-10.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown = link_to "#{display_button_action} #{display_issuable_type}", close_reopen_issuable_path(issuable), - method: button_method, class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", title: "#{display_button_action} #{display_issuable_type}", data: { qa_selector: 'close_issue_button', 'close-reopen-url': close_reopen_issuable_path(issuable) } + method: button_method, class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", title: "#{display_button_action} #{display_issuable_type}", data: { qa_selector: 'close_issue_button' } = button_tag type: 'button', class: "#{toggle_class} btn-#{button_action}-color", data: { 'dropdown-trigger' => '#issuable-close-menu' }, 'aria-label' => _('Toggle dropdown') do |