diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 01:01:58 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 01:01:58 +0000 |
| commit | 4a5b3707798c2dde62dd78c40b8f0393b38c8041 (patch) | |
| tree | 1f73d09424cb5ca929a3cde97cc873e997369f86 /spec/features/projects/blobs/edit_spec.rb | |
| parent | 44cc030574593dc72514f22b453eb966751b9b78 (diff) | |
| parent | cae2c336819d1838507b0c5d21c609710b21ac4f (diff) | |
| download | gitlab-ce-4a5b3707798c2dde62dd78c40b8f0393b38c8041.tar.gz | |
Merge branch 'revert-82d7b5a0-ce' into 'master'
[CE port] Revert "Automatic merge of gitlab-org/gitlab-ce master"
See merge request gitlab-org/gitlab-ce!25537
Diffstat (limited to 'spec/features/projects/blobs/edit_spec.rb')
| -rw-r--r-- | spec/features/projects/blobs/edit_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 1522a3361a1..6e6c299ee2e 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -77,7 +77,7 @@ describe 'Editing file blob', :js do click_link 'Preview' wait_for_requests - # the above generates two separate lists (not embedded) in CommonMark + # the above generates two seperate lists (not embedded) in CommonMark expect(page).to have_content("sublist") expect(page).not_to have_xpath("//ol//li//ul") end |