diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:31 +0300 |
| commit | 28ce39a3e0e7b47e53939a15fb823af9c433327a (patch) | |
| tree | f703cd7b431827880ccb74b98d16fab0f60dd245 /app/assets/javascripts/blob | |
| parent | afe057a8ff8546f0032e439a9a200307fb6de86a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
| -rw-r--r-- | app/assets/javascripts/blob/notebook/index.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/blob/pdf/index.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js index 071022a9a75..35634d63e4a 100644 --- a/app/assets/javascripts/blob/notebook/index.js +++ b/app/assets/javascripts/blob/notebook/index.js @@ -75,10 +75,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst parsing the file. + An error occurred while parsing the file. </span> </p> </div> diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js index 7d5f487c4ba..e9a0b3979e6 100644 --- a/app/assets/javascripts/blob/pdf/index.js +++ b/app/assets/javascripts/blob/pdf/index.js @@ -47,10 +47,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst decoding the file. + An error occurred while decoding the file. </span> </p> </div> |