diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-27 19:23:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-27 19:23:05 +0000 |
| commit | e051ef69e3adb5d8a06a5f7fb5719c7987fe4841 (patch) | |
| tree | cb43939bec4425130b380d45e80c1ad0c80f6a0d /spec/features/atom | |
| parent | 5cd79bd641c4cd473da768b08ef18dc285f10b8e (diff) | |
| parent | b8cab61ff016156e8c527322bb72d4185d752e44 (diff) | |
| download | gitlab-ce-e051ef69e3adb5d8a06a5f7fb5719c7987fe4841.tar.gz | |
Merge branch '20890-comment-image-inline' into 'master'
28711-cherry-picking-ui-regressions-8-17-0
Fix inline comment images by removing wrapper #20890
Closes #20890
See merge request !5804
Diffstat (limited to 'spec/features/atom')
| -rw-r--r-- | spec/features/atom/users_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb index f8c3ccb416b..b740e191f48 100644 --- a/spec/features/atom/users_spec.rb +++ b/spec/features/atom/users_spec.rb @@ -61,7 +61,7 @@ describe "User Feed", feature: true do end it 'has XHTML summaries in merge request descriptions' do - expect(body).to match /Here is the fix: <\/p><div[^>]*><a[^>]*><img[^>]*\/><\/a><\/div>/ + expect(body).to match /Here is the fix: <a[^>]*><img[^>]*\/><\/a>/ end end end |