Merge branch 'ee-proof-read' into 'master'

EE: Fix typo

See merge request gitlab-org/gitlab-ee!13753

app/assets/javascripts/repository/components/table/index.vue

@@ -100,7 +100,7 @@ export default {
             this.fetchFiles();
           }
         })
-        .catch(() => createFlash(__('An error occurding while fetching folder content.')));
+        .catch(() => createFlash(__('An error occurred while fetching folder content.')));
     },
     normalizeData(key, data) {
       return this.entries[key].concat(data.map(({ node }) => node));

locale/gitlab.pot

@@ -1037,9 +1037,6 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occurding while fetching folder content."
-msgstr ""
-
 msgid "An error occurred adding a draft to the discussion."
 msgstr ""
 
@@ -1097,6 +1094,9 @@ msgstr ""
 msgid "An error occurred while enabling Service Desk."
 msgstr ""
 
+msgid "An error occurred while fetching folder content."
+msgstr ""
+
 msgid "An error occurred while fetching label colors."
 msgstr ""