summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-08 09:09:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-08 09:09:25 +0000
commitef44feb7fa697e96b7011aa45ea3ca7e5087a490 (patch)
tree5b818185d150eaa8e4d9a28a28f62940de598c57 /spec/controllers/projects/merge_requests_controller_spec.rb
parent935bc5955fb3d740f1cc2b380665bbc8875a68b6 (diff)
downloadgitlab-ce-ef44feb7fa697e96b7011aa45ea3ca7e5087a490.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 026cf19bde5..a93dc806283 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Projects::MergeRequestsController do
+RSpec.describe Projects::MergeRequestsController, feature_category: :code_review do
include ProjectForksHelper
include Gitlab::Routing
using RSpec::Parameterized::TableSyntax