diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-15 18:13:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-15 18:13:59 +0300 |
| commit | f9da8786f9421281e390d921333f8ff4c9941354 (patch) | |
| tree | 88e44000c2abe0589cf3aee22861eb7a73146127 /spec/features | |
| parent | a19ad7fa983054d09b35c5fe0bdf853acc55a1bc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/settings/merge_requests_settings_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb index 8b5f9b67890..c1b4caae014 100644 --- a/spec/features/projects/settings/merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/merge_requests_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Merge requests', feature_category: :groups_and_projects do +RSpec.describe 'Projects > Settings > Merge requests', feature_category: :code_review_workflow do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index 1189f5590f8..6fe8a2c3f10 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe 'Projects > Settings > User manages merge request settings', feature_category: :groups_and_projects do +RSpec.describe 'Projects > Settings > User manages merge request settings', feature_category: :code_review_workflow do include ProjectForksHelper let(:user) { create(:user) } |