From 35a0c3d4fd3c89aebcd7c66b9f08536d6f6521b2 Mon Sep 17 00:00:00 2001
From: Ray Paik <rpaik@gitlab.com>
Date: Fri, 8 Mar 2019 05:11:18 +0000
Subject: [PATCH 1/3] Update index.vue to fix a typo in an error message

---
 ee/app/assets/javascripts/design_management/pages/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/app/assets/javascripts/design_management/pages/index.vue b/ee/app/assets/javascripts/design_management/pages/index.vue
index 386e72d827bc7b..6b2986e1549aa9 100644
--- a/ee/app/assets/javascripts/design_management/pages/index.vue
+++ b/ee/app/assets/javascripts/design_management/pages/index.vue
@@ -35,7 +35,7 @@ export default {
     <div class="mt-4">
       <gl-loading-icon v-if="isLoading" :size="2" />
       <div v-else-if="error" class="alert alert-danger">
-        {{ __('An error occured while loading designs. Please try again.') }}
+        {{ __('An error occurred while loading designs. Please try again.') }}
       </div>
       <design-list v-else-if="designs.length" :designs="designs" />
       <div v-else>{{ __('No designs found.') }}</div>
-- 
GitLab


From 36dc667bb5d3ce36b23a52179e8f0c5cabf9d508 Mon Sep 17 00:00:00 2001
From: Ray Paik <rpaik@gitlab.com>
Date: Fri, 8 Mar 2019 05:12:44 +0000
Subject: [PATCH 2/3] Update index_spec.js.snap to fix a misspelling in an
 error message

---
 .../design_management/pages/__snapshots__/index_spec.js.snap    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap b/ee/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
index 619a3f3775b955..a957094e830cfa 100644
--- a/ee/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
+++ b/ee/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
@@ -33,7 +33,7 @@ exports[`Design management index page designs renders error 1`] = `
       class="alert alert-danger"
     >
       
-      An error occured while loading designs. Please try again.
+      An error occurred while loading designs. Please try again.
     
     </div>
   </div>
-- 
GitLab


From 685e61789ba910669864757d5dcf47ad66153d48 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Tue, 12 Mar 2019 11:27:01 +0200
Subject: [PATCH 3/3] Add externalized strings for design management component

---
 locale/gitlab.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 91d2a84da727aa..bcddf1a6be12fb 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -811,9 +811,6 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occured while loading designs. Please try again."
-msgstr ""
-
 msgid "An error occurred adding a draft to the discussion."
 msgstr ""
 
@@ -901,6 +898,9 @@ msgstr ""
 msgid "An error occurred while loading commit signatures"
 msgstr ""
 
+msgid "An error occurred while loading designs. Please try again."
+msgstr ""
+
 msgid "An error occurred while loading diff"
 msgstr ""
 
-- 
GitLab