diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 16:02:28 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 16:02:28 +0000 |
| commit | 13c723f1dd99a6488df0efc89f46cdae1e57126d (patch) | |
| tree | 55d0bb4af6cd99695cc8a5f03d011d027475f7c4 /spec/features/projects/blobs/edit_spec.rb | |
| parent | f26cd63b0f7e9acc29a72d81ad2ed327ac93b816 (diff) | |
| parent | f49aeacdd0b20cc270423409efaf82b26ced4836 (diff) | |
| download | gitlab-ce-13c723f1dd99a6488df0efc89f46cdae1e57126d.tar.gz | |
Merge branch 'ce-revert-d5ce84fd' into 'master'
Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'"
Closes #57857 and #50747
See merge request gitlab-org/gitlab-ce!25559
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 6e6c299ee2e..1522a3361a1 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 seperate lists (not embedded) in CommonMark + # the above generates two separate lists (not embedded) in CommonMark expect(page).to have_content("sublist") expect(page).not_to have_xpath("//ol//li//ul") end |