diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-31 17:05:46 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-31 17:05:46 +0300 |
| commit | be01c431423eaba1e9aefdca77eb9ac5c054e6ad (patch) | |
| tree | 2c8dda0161a65385cba1c75e0c000a8d979d9ff9 | |
| parent | 12aff0b73cacf533533d584d68307b1b6a030cee (diff) | |
| parent | 6c0d4c958a23c616789ba5e96d7e2b232782597b (diff) | |
Merge branch 'proof-read' into 'master'
Fix typo
See merge request gitlab-org/gitlab-ce!28939
| -rw-r--r-- | app/assets/javascripts/repository/components/table/index.vue | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue index f4df98ac2ff..cccde1bb278 100644 --- a/app/assets/javascripts/repository/components/table/index.vue +++ b/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)); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9627e922dfd..f737d75ca95 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -853,9 +853,6 @@ msgstr "" msgid "An error has occurred" msgstr "" -msgid "An error occurding while fetching folder content." -msgstr "" - msgid "An error occurred creating the new branch." msgstr "" @@ -883,6 +880,9 @@ msgstr "" msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again." msgstr "" +msgid "An error occurred while fetching folder content." +msgstr "" + msgid "An error occurred while fetching label colors." msgstr "" |