Commit 9e2c0c63 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖 Committed by Enrique Alcántara

Update dependency @gitlab/ui to v20.4.1

parent 1f84a0b2
...@@ -173,11 +173,15 @@ export default class Issue { ...@@ -173,11 +173,15 @@ export default class Issue {
} }
initIssueWarningBtnEventListener() { initIssueWarningBtnEventListener() {
return $(document).on('click', '.js-close-blocked-issue-warning button.btn-secondary', e => { return $(document).on(
e.preventDefault(); 'click',
e.stopImmediatePropagation(); '.js-close-blocked-issue-warning .js-cancel-blocked-issue-warning',
this.toggleWarningAndCloseButton(); e => {
}); e.preventDefault();
e.stopImmediatePropagation();
this.toggleWarningAndCloseButton();
},
);
} }
initIssueMovedFromServiceDeskDismissHandler() { initIssueMovedFromServiceDeskDismissHandler() {
......
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
= s_("MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile").html_safe = s_("MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile").html_safe
.gl-alert-actions .gl-alert-actions
= link_to s_('MissingSSHKeyWarningLink|Add SSH key'), profile_keys_path, class: "btn gl-alert-action btn-warning btn-md new-gl-button" = link_to s_('MissingSSHKeyWarningLink|Add SSH key'), profile_keys_path, class: "btn gl-alert-action btn-warning btn-md new-gl-button"
= link_to s_("MissingSSHKeyWarningLink|Don't show again"), profile_path(user: {hide_no_ssh_key: true}), method: :put, role: 'button', class: 'btn gl-alert-action btn-md btn-warning btn-secondary new-gl-button' = link_to s_("MissingSSHKeyWarningLink|Don't show again"), profile_path(user: {hide_no_ssh_key: true}), method: :put, role: 'button', class: 'btn gl-alert-action btn-md btn-warning gl-button btn-warning-secondary'
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
text: __('Download as CSV'), text: __('Download as CSV'),
attributes: { attributes: {
variant: 'success', variant: 'success',
class: 'btn-secondary gl-button', class: 'gl-button btn-success-secondary',
href: this.downloadLink, href: this.downloadLink,
download: '', download: '',
'data-testid': 'download-button', 'data-testid': 'download-button',
......
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
= _('Your instance has %{remaining_user_count} users remaining of the %{total_user_count} included in your subscription. You can add more users than the number included in your license, and we will include the overage in your next bill.') % { remaining_user_count: remaining_user_count, total_user_count: total_user_count } = _('Your instance has %{remaining_user_count} users remaining of the %{total_user_count} included in your subscription. You can add more users than the number included in your license, and we will include the overage in your next bill.') % { remaining_user_count: remaining_user_count, total_user_count: total_user_count }
.gl-alert-actions .gl-alert-actions
= link_to _('View users statistics'), admin_users_path, class: 'btn gl-alert-action btn-info btn-md gl-button' = link_to _('View users statistics'), admin_users_path, class: 'btn gl-alert-action btn-info btn-md gl-button'
= link_to _('Contact support'), EE::CUSTOMER_LICENSE_SUPPORT_URL, rel: 'nofollow', class: 'btn gl-alert-action btn-info btn-md btn-secondary gl-button' = link_to _('Contact support'), EE::CUSTOMER_LICENSE_SUPPORT_URL, rel: 'nofollow', class: 'btn gl-alert-action btn-info btn-md gl-button btn-info-secondary'
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
.gl-alert-actions .gl-alert-actions
%button{ class: "btn btn-close-anyway gl-alert-action btn-warning btn-md gl-button", data: { endpoint: close_issuable_path(@issue) } } %button{ class: "btn btn-close-anyway gl-alert-action btn-warning btn-md gl-button", data: { endpoint: close_issuable_path(@issue) } }
= _("Yes, close issue") = _("Yes, close issue")
%button.btn.gl-alert-action.btn-warning.btn-md.gl-button.btn-secondary %button.btn.gl-alert-action.btn-warning.btn-md.gl-button.btn-warning-secondary.js-cancel-blocked-issue-warning
= s_('Cancel') = s_('Cancel')
...@@ -78,7 +78,7 @@ describe('Issue', () => { ...@@ -78,7 +78,7 @@ describe('Issue', () => {
setImmediate(() => { setImmediate(() => {
expect($alert).not.toHaveClass('hidden'); expect($alert).not.toHaveClass('hidden');
const $cancelbtn = $('.js-close-blocked-issue-warning .btn-secondary'); const $cancelbtn = $('.js-close-blocked-issue-warning .js-cancel-blocked-issue-warning');
$cancelbtn.trigger('click'); $cancelbtn.trigger('click');
expect($alert).toHaveClass('hidden'); expect($alert).toHaveClass('hidden');
......
...@@ -133,7 +133,7 @@ describe('issue_comment_form component', () => { ...@@ -133,7 +133,7 @@ describe('issue_comment_form component', () => {
wrapper.vm.$nextTick(() => { wrapper.vm.$nextTick(() => {
const warning = wrapper.find('.gl-alert-warning'); const warning = wrapper.find('.gl-alert-warning');
const secondaryButton = warning.find('.gl-alert-actions .btn-secondary'); const secondaryButton = warning.find('.gl-alert-actions .btn-default');
expect(secondaryButton.text()).toEqual('Cancel'); expect(secondaryButton.text()).toEqual('Cancel');
secondaryButton.trigger('click'); secondaryButton.trigger('click');
wrapper.vm.$nextTick(() => { wrapper.vm.$nextTick(() => {
......
...@@ -4,7 +4,7 @@ exports[`Expand button on click when short text is provided renders button after ...@@ -4,7 +4,7 @@ exports[`Expand button on click when short text is provided renders button after
<span> <span>
<button <button
aria-label="Click to expand text" aria-label="Click to expand text"
class="btn js-text-expander-prepend text-expander btn-blank btn-default btn-md btn-icon button-ellipsis-horizontal gl-button" class="btn js-text-expander-prepend text-expander btn-blank btn-default btn-md gl-button btn-icon button-ellipsis-horizontal"
style="display: none;" style="display: none;"
type="button" type="button"
> >
...@@ -32,7 +32,7 @@ exports[`Expand button on click when short text is provided renders button after ...@@ -32,7 +32,7 @@ exports[`Expand button on click when short text is provided renders button after
<button <button
aria-label="Click to expand text" aria-label="Click to expand text"
class="btn js-text-expander-append text-expander btn-blank btn-default btn-md btn-icon button-ellipsis-horizontal gl-button" class="btn js-text-expander-append text-expander btn-blank btn-default btn-md gl-button btn-icon button-ellipsis-horizontal"
style="" style=""
type="button" type="button"
> >
...@@ -56,7 +56,7 @@ exports[`Expand button when short text is provided renders button before text 1` ...@@ -56,7 +56,7 @@ exports[`Expand button when short text is provided renders button before text 1`
<span> <span>
<button <button
aria-label="Click to expand text" aria-label="Click to expand text"
class="btn js-text-expander-prepend text-expander btn-blank btn-default btn-md btn-icon button-ellipsis-horizontal gl-button" class="btn js-text-expander-prepend text-expander btn-blank btn-default btn-md gl-button btn-icon button-ellipsis-horizontal"
type="button" type="button"
> >
<!----> <!---->
...@@ -83,7 +83,7 @@ exports[`Expand button when short text is provided renders button before text 1` ...@@ -83,7 +83,7 @@ exports[`Expand button when short text is provided renders button before text 1`
<button <button
aria-label="Click to expand text" aria-label="Click to expand text"
class="btn js-text-expander-append text-expander btn-blank btn-default btn-md btn-icon button-ellipsis-horizontal gl-button" class="btn js-text-expander-append text-expander btn-blank btn-default btn-md gl-button btn-icon button-ellipsis-horizontal"
style="display: none;" style="display: none;"
type="button" type="button"
> >
......
...@@ -848,10 +848,10 @@ ...@@ -848,10 +848,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.158.0.tgz#300d416184a2b0e05f15a96547f726e1825b08a1" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.158.0.tgz#300d416184a2b0e05f15a96547f726e1825b08a1"
integrity sha512-5OJl+7TsXN9PJhY6/uwi+mTwmDZa9n/6119rf77orQ/joFYUypaYhBmy/1TcKVPsy5Zs6KCxE1kmGsfoXc1TYA== integrity sha512-5OJl+7TsXN9PJhY6/uwi+mTwmDZa9n/6119rf77orQ/joFYUypaYhBmy/1TcKVPsy5Zs6KCxE1kmGsfoXc1TYA==
"@gitlab/ui@20.4.0": "@gitlab/ui@20.4.1":
version "20.4.0" version "20.4.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-20.4.0.tgz#ea5195b181f56312ede55e89c444805594adedbb" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-20.4.1.tgz#a57f5f898971976077fcc3898a33a870651e62dd"
integrity sha512-QLxj0a2iRDuSvAdvgZf8KtpUg8Bt8jSQbupCdiiohSp73LidRB4aZv0b/TTb6sxpmhKRaKSx9uqHrpHXtymGyw== integrity sha512-HFBiT7KNNKcNdYEze87d8n8G7rC1ZGWgbLcrxxBO3ojjqQsEab7tfufors7a7TOnCvbnWLlABYlX3uDkvOX6cg==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment