Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 15:08:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 15:08:31 +0300
commit28ce39a3e0e7b47e53939a15fb823af9c433327a (patch)
treef703cd7b431827880ccb74b98d16fab0f60dd245 /spec/javascripts/blob
parentafe057a8ff8546f0032e439a9a200307fb6de86a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/blob')
-rw-r--r--spec/javascripts/blob/notebook/index_spec.js4
-rw-r--r--spec/javascripts/blob/pdf/index_spec.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js
index 6bb5bac007f..db6ca5bd22d 100644
--- a/spec/javascripts/blob/notebook/index_spec.js
+++ b/spec/javascripts/blob/notebook/index_spec.js
@@ -94,7 +94,7 @@ describe('iPython notebook renderer', () => {
it('shows error message', () => {
expect(document.querySelector('.md').textContent.trim()).toBe(
- 'An error occurred whilst parsing the file.',
+ 'An error occurred while parsing the file.',
);
});
});
@@ -123,7 +123,7 @@ describe('iPython notebook renderer', () => {
it('shows error message', () => {
expect(document.querySelector('.md').textContent.trim()).toBe(
- 'An error occurred whilst loading the file. Please try again later.',
+ 'An error occurred while loading the file. Please try again later.',
);
});
});
diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js
index 6ea097da742..66769a8aa47 100644
--- a/spec/javascripts/blob/pdf/index_spec.js
+++ b/spec/javascripts/blob/pdf/index_spec.js
@@ -65,7 +65,7 @@ describe('PDF renderer', () => {
it('shows error message', () => {
expect(document.querySelector('.md').textContent.trim()).toBe(
- 'An error occurred whilst loading the file. Please try again later.',
+ 'An error occurred while loading the file. Please try again later.',
);
});
});