Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/javascripts/labels/group_label_subscription.js b/app/assets/javascripts/labels/group_label_subscription.js
index 4db0ab3ba3e..3683bb5d5e5 100644
--- a/app/assets/javascripts/labels/group_label_subscription.js
+++ b/app/assets/javascripts/labels/group_label_subscription.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import { __ } from '~/locale';
 import { fixTitle, hide } from '~/tooltips';
 import { createAlert } from '~/alert';
+import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants';
 import axios from '~/lib/utils/axios_utils';
 
 const tooltipTitles = {
@@ -65,7 +66,7 @@ export default class GroupLabelSubscription {
   static setNewTooltip($button) {
     if (!$button.hasClass('js-subscribe-button')) return;
 
-    const type = $button.hasClass('js-group-level') ? 'group' : 'project';
+    const type = $button.hasClass('js-group-level') ? WORKSPACE_GROUP : WORKSPACE_PROJECT;
     const newTitle = tooltipTitles[type];
 
     const $el = $('.js-unsubscribe-button', $button.closest('.label-actions-list'));
diff --git a/app/assets/javascripts/labels/project_label_subscription.js b/app/assets/javascripts/labels/project_label_subscription.js
index f2227ddcf92..1629d3b4d88 100644
--- a/app/assets/javascripts/labels/project_label_subscription.js
+++ b/app/assets/javascripts/labels/project_label_subscription.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import { fixTitle } from '~/tooltips';
 import { createAlert } from '~/alert';
+import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants';
 import axios from '~/lib/utils/axios_utils';
 import { __ } from '~/locale';
 
@@ -68,7 +69,7 @@ export default class ProjectLabelSubscription {
   }
 
   static setNewTitle($button, originalTitle, newStatus) {
-    const type = /group/.test(originalTitle) ? 'group' : 'project';
+    const type = /group/.test(originalTitle) ? WORKSPACE_GROUP : WORKSPACE_PROJECT;
     const newTitle = tooltipTitles[type][newStatus];
 
     $button.attr('title', newTitle);