diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 06:14:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 06:14:17 +0300 |
commit | edd6fda56d54d7223eb67a15341603e44c3a5f7a (patch) | |
tree | 530bac6c3c884f3973512fac94c3974b8deb818e /app | |
parent | d150848f7ed150d4f1887a4bff7cc4c423c55186 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index 0021fe909e5..e41f3aa5c9d 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -236,6 +236,8 @@ export default { }, statusTimeRanges, safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, + actionPrimary: { text: s__('SetStatusModal|Set status') }, + actionSecondary: { text: s__('SetStatusModal|Remove status') }, }; </script> @@ -243,14 +245,13 @@ export default { <gl-modal :title="s__('SetStatusModal|Set a status')" :modal-id="modalId" - :ok-title="s__('SetStatusModal|Set status')" - :cancel-title="s__('SetStatusModal|Remove status')" - ok-variant="success" + :action-primary="$options.actionPrimary" + :action-secondary="$options.actionSecondary" modal-class="set-user-status-modal" @shown="setupEmojiListAndAutocomplete" @hide="hideEmojiMenu" - @ok="setStatus" - @cancel="removeStatus" + @primary="setStatus" + @secondary="removeStatus" > <div> <input |