diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:35:22 +0100 | 
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:35:22 +0100 | 
| commit | e0401df1214397626e65e58166988fe62715d372 (patch) | |
| tree | 087d8ca4a1611aa50a8ac98e66f7d1657ff1f90f /spec/javascripts/blob | |
| parent | 2b7b60728426c10ef1188a1073d3630805773a35 (diff) | |
| parent | 11c67e7c2f992299ff5918ce67995b73d1e0be6d (diff) | |
| download | gitlab-ce-e0401df1214397626e65e58166988fe62715d372.tar.gz | |
Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-ee-to-ce-backport
Diffstat (limited to 'spec/javascripts/blob')
| -rw-r--r-- | spec/javascripts/blob/notebook/index_spec.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/blob/pdf/index_spec.js | 2 | 
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 11f2a950678..c3e67550f05 100644 --- a/spec/javascripts/blob/notebook/index_spec.js +++ b/spec/javascripts/blob/notebook/index_spec.js @@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => {      it('shows error message', () => {        expect(          document.querySelector('.md').textContent.trim(), -      ).toBe('An error occured whilst parsing the file.'); +      ).toBe('An error occurred whilst parsing the file.');      });    }); @@ -153,7 +153,7 @@ describe('iPython notebook renderer', () => {      it('shows error message', () => {        expect(          document.querySelector('.md').textContent.trim(), -      ).toBe('An error occured whilst loading the file. Please try again later.'); +      ).toBe('An error occurred whilst 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 bbeaf95e68d..51bf3086627 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -76,7 +76,7 @@ describe('PDF renderer', () => {      it('shows error message', () => {        expect(          document.querySelector('.md').textContent.trim(), -      ).toBe('An error occured whilst loading the file. Please try again later.'); +      ).toBe('An error occurred whilst loading the file. Please try again later.');      });    });  }); | 
