Merge branch 'add-missing-feature-category-to-merge-requests-controllers' into 'master'

Add missing feature_category to merge_requests controllers

See merge request !120973



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: David Kim <dkim@gitlab.com>

spec/controllers/projects/merge_requests/conflicts_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::MergeRequests::ConflictsController do
+RSpec.describe Projects::MergeRequests::ConflictsController, feature_category: :code_review_workflow do
   let(:project) { create(:project, :repository) }
   let(:user)    { project.first_owner }
   let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }

spec/controllers/projects/merge_requests/content_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::MergeRequests::ContentController do
+RSpec.describe Projects::MergeRequests::ContentController, feature_category: :code_review_workflow do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:merge_request) { create(:merge_request, target_project: project, source_project: project) }

spec/controllers/projects/merge_requests/drafts_controller_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Projects::MergeRequests::DraftsController do
+RSpec.describe Projects::MergeRequests::DraftsController, feature_category: :code_review_workflow do
   include RepoHelpers
 
   let(:project)       { create(:project, :repository) }