diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:07:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:07:41 +0000 |
| commit | 4ce0bee95df15c05cdb0d777eba31fe753bc443b (patch) | |
| tree | 3dc6a1aae7e0a01280f6d9f7d774dd369f7863e1 /spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | |
| parent | 02ab65d49fc94be7c91e511899762236c122977d (diff) | |
| download | gitlab-ce-4ce0bee95df15c05cdb0d777eba31fe753bc443b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 9cbea8a8466..eb86b1e33af 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -20,12 +20,9 @@ describe 'Merge request > User resolves diff notes and threads', :js do end before do - stub_feature_flags(single_mr_diff_view: false) stub_feature_flags(diffs_batch_load: false) end - it_behaves_like 'rendering a single diff version' - context 'no threads' do before do project.add_maintainer(user) |