diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 21:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 21:09:25 +0300 |
| commit | 174343966742d2f4b87ac84f9ce4ee576cb9d75e (patch) | |
| tree | 265908b79177da98dcd58cac300d81090416a8ee /spec/features/discussion_comments | |
| parent | 6cbb93596d65dff377372f4b50da932dcf6dc514 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/discussion_comments')
| -rw-r--r-- | spec/features/discussion_comments/issue_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/discussion_comments/merge_request_spec.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb index 2ad77a2884c..86743e31fbd 100644 --- a/spec/features/discussion_comments/issue_spec.rb +++ b/spec/features/discussion_comments/issue_spec.rb @@ -8,6 +8,8 @@ RSpec.describe 'Thread Comments Issue', :js do let(:issue) { create(:issue, project: project) } before do + stub_feature_flags(remove_comment_close_reopen: false) + project.add_maintainer(user) sign_in(user) diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb index 761cc7ae796..82dcdf9f918 100644 --- a/spec/features/discussion_comments/merge_request_spec.rb +++ b/spec/features/discussion_comments/merge_request_spec.rb @@ -9,6 +9,7 @@ RSpec.describe 'Thread Comments Merge Request', :js do before do stub_feature_flags(remove_resolve_note: false) + stub_feature_flags(remove_comment_close_reopen: false) project.add_maintainer(user) sign_in(user) |