Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 9 deletions

diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js
index d82ad31822c..715c2ef843f 100644
--- a/app/assets/javascripts/work_items/constants.js
+++ b/app/assets/javascripts/work_items/constants.js
@@ -57,6 +57,9 @@ export const i18n = {
 export const I18N_WORK_ITEM_ERROR_FETCHING_LABELS = s__(
   'WorkItem|Something went wrong when fetching labels. Please try again.',
 );
+export const I18N_WORK_ITEM_ERROR_FETCHING_TYPES = s__(
+  'WorkItem|Something went wrong when fetching work item types. Please try again',
+);
 export const I18N_WORK_ITEM_ERROR_CREATING = s__(
   'WorkItem|Something went wrong when creating %{workItemType}. Please try again.',
 );
@@ -239,10 +242,6 @@ export const TODO_DONE_ICON = 'todo-done';
 export const TODO_DONE_STATE = 'done';
 export const TODO_PENDING_STATE = 'pending';
 
-export const CURRENT_USER_TODOS_TYPENAME = 'WorkItemWidgetCurrentUserTodos';
-
-export const EMOJI_ACTION_ADD = 'ADD';
-export const EMOJI_ACTION_REMOVE = 'REMOVE';
 export const EMOJI_THUMBSUP = 'thumbsup';
 export const EMOJI_THUMBSDOWN = 'thumbsdown';
 
diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue
index 49ec12db4e1..b5705b21b5a 100644
--- a/app/assets/javascripts/work_items/pages/create_work_item.vue
+++ b/app/assets/javascripts/work_items/pages/create_work_item.vue
@@ -3,7 +3,11 @@ import { GlButton, GlAlert, GlLoadingIcon, GlFormSelect } from '@gitlab/ui';
 import { TYPENAME_PROJECT } from '~/graphql_shared/constants';
 import { getPreferredLocales, s__ } from '~/locale';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
-import { sprintfWorkItem, I18N_WORK_ITEM_ERROR_CREATING } from '../constants';
+import {
+  I18N_WORK_ITEM_ERROR_CREATING,
+  I18N_WORK_ITEM_ERROR_FETCHING_TYPES,
+  sprintfWorkItem,
+} from '../constants';
 import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql';
 import projectWorkItemTypesQuery from '../graphql/project_work_item_types.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
@@ -11,9 +15,6 @@ import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 import ItemTitle from '../components/item_title.vue';
 
 export default {
-  fetchTypesErrorText: s__(
-    'WorkItem|Something went wrong when fetching work item types. Please try again',
-  ),
   components: {
     GlButton,
     GlAlert,
@@ -53,7 +54,7 @@ export default {
         }));
       },
       error() {
-        this.error = this.$options.fetchTypesErrorText;
+        this.error = I18N_WORK_ITEM_ERROR_FETCHING_TYPES;
       },
     },
   },