Update feature category of some actions/endpoints

These actions/endpoints are not under code review feature category.

They're are under the following categories:
- `code_testing`
- `usability_testing`
- `continuous_integration`

app/controllers/projects/merge_requests_controller.rb

@@ -67,16 +67,19 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   feature_category :code_review, [
                      :assign_related_issues, :bulk_update, :cancel_auto_merge,
-                     :ci_environments_status, :commit_change_content, :commits,
-                     :context_commits, :destroy, :diff_for_path, :discussions,
-                     :edit, :exposed_artifacts, :index, :merge,
-                     :pipeline_status, :pipelines, :rebase, :remove_wip, :show,
-                     :toggle_award_emoji, :toggle_subscription, :update
+                     :commit_change_content, :commits, :context_commits, :destroy,
+                     :discussions, :edit, :index, :merge, :rebase, :remove_wip,
+                     :show, :toggle_award_emoji, :toggle_subscription, :update
+                   ]
+
+  feature_category :code_testing, [
+                     :test_reports, :coverage_reports, :codequality_reports,
+                     :codequality_mr_diff_reports
                    ]
 
-  feature_category :code_testing, [:test_reports, :coverage_reports, :codequality_mr_diff_reports]
   feature_category :accessibility_testing, [:accessibility_reports]
   feature_category :infrastructure_as_code, [:terraform_reports]
+  feature_category :continuous_integration, [:pipeline_status, :pipelines, :exposed_artifacts]
 
   def index
     @merge_requests = @issuables

ee/lib/api/visual_review_discussions.rb

@@ -6,7 +6,7 @@ module API
     helpers ::API::Helpers::NotesHelpers
     helpers ::RendersNotes
 
-    feature_category :code_review
+    feature_category :usability_testing
 
     params do
       requires :id, type: String, desc: "The ID of a Project"

lib/api/merge_requests.rb

@@ -8,11 +8,20 @@ module API
 
     before { authenticate_non_get! }
 
-    feature_category :code_review
-
     helpers Helpers::MergeRequestsHelpers
     helpers Helpers::SSEHelpers
 
+    # These endpoints are defined in `TimeTrackingEndpoints` and is shared by
+    # API::Issues. In order to be able to define the feature category of these
+    # endpoints, we need to define them at the top-level by route.
+    feature_category :code_review, [
+      '/projects/:id/merge_requests/:merge_request_iid/time_estimate',
+      '/projects/:id/merge_requests/:merge_request_iid/reset_time_estimate',
+      '/projects/:id/merge_requests/:merge_request_iid/add_spent_time',
+      '/projects/:id/merge_requests/:merge_request_iid/reset_spent_time',
+      '/projects/:id/merge_requests/:merge_request_iid/time_stats'
+    ]
+
     # EE::API::MergeRequests would override the following helpers
     helpers do
       params :optional_params_ee do
@@ -125,7 +134,7 @@ module API
         use :merge_requests_params
         use :optional_scope_param
       end
-      get do
+      get feature_category: :code_review do
         authenticate! unless params[:scope] == 'all'
         merge_requests = find_merge_requests
 
@@ -145,7 +154,7 @@ module API
         optional :non_archived, type: Boolean, desc: 'Return merge requests from non archived projects',
         default: true
       end
-      get ":id/merge_requests" do
+      get ":id/merge_requests", feature_category: :code_review do
         merge_requests = find_merge_requests(group_id: user_group.id, include_subgroups: true)
 
         present merge_requests, serializer_options_for(merge_requests).merge(group: user_group)
@@ -184,7 +193,7 @@ module API
         use :merge_requests_params
         optional :iids, type: Array[Integer], coerce_with: ::API::Validations::Types::CommaSeparatedToIntegerArray.coerce, desc: 'The IID array of merge requests'
       end
-      get ":id/merge_requests" do
+      get ":id/merge_requests", feature_category: :code_review do
         authorize! :read_merge_request, user_project
 
         merge_requests = find_merge_requests(project_id: user_project.id)
@@ -206,7 +215,7 @@ module API
                                      desc: 'The target project of the merge request defaults to the :id of the project'
         use :optional_params
       end
-      post ":id/merge_requests" do
+      post ":id/merge_requests", feature_category: :code_review do
         Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20770')
 
         authorize! :create_merge_request_from, user_project
@@ -228,7 +237,7 @@ module API
       params do
         requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
       end
-      delete ":id/merge_requests/:merge_request_iid" do
+      delete ":id/merge_requests/:merge_request_iid", feature_category: :code_review do
         merge_request = find_project_merge_request(params[:merge_request_iid])
 
         authorize!(:destroy_merge_request, merge_request)
@@ -247,7 +256,7 @@ module API
       desc 'Get a single merge request' do
         success Entities::MergeRequest
       end
-      get ':id/merge_requests/:merge_request_iid' do
+      get ':id/merge_requests/:merge_request_iid', feature_category: :code_review do
         not_found!("Merge Request") unless can?(current_user, :read_merge_request, user_project)
 
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
@@ -265,7 +274,7 @@ module API
       desc 'Get the participants of a merge request' do
         success Entities::UserBasic
       end
-      get ':id/merge_requests/:merge_request_iid/participants' do
+      get ':id/merge_requests/:merge_request_iid/participants', feature_category: :code_review do
         not_found!("Merge Request") unless can?(current_user, :read_merge_request, user_project)
 
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
@@ -278,7 +287,7 @@ module API
       desc 'Get the commits of a merge request' do
         success Entities::Commit
       end
-      get ':id/merge_requests/:merge_request_iid/commits' do
+      get ':id/merge_requests/:merge_request_iid/commits', feature_category: :code_review do
         not_found!("Merge Request") unless can?(current_user, :read_merge_request, user_project)
 
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
@@ -293,7 +302,7 @@ module API
       desc 'Get the context commits of a merge request' do
         success Entities::Commit
       end
-      get ':id/merge_requests/:merge_request_iid/context_commits' do
+      get ':id/merge_requests/:merge_request_iid/context_commits', feature_category: :code_review do
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
         project = merge_request.project
 
@@ -311,7 +320,7 @@ module API
       desc 'create context commits of merge request' do
         success Entities::Commit
       end
-      post ':id/merge_requests/:merge_request_iid/context_commits' do
+      post ':id/merge_requests/:merge_request_iid/context_commits', feature_category: :code_review do
         commit_ids = params[:commits]
 
         if commit_ids.size > CONTEXT_COMMITS_POST_LIMIT
@@ -339,7 +348,7 @@ module API
         requires :commits, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, allow_blank: false, desc: 'List of context commits sha'
       end
       desc 'remove context commits of merge request'
-      delete ':id/merge_requests/:merge_request_iid/context_commits' do
+      delete ':id/merge_requests/:merge_request_iid/context_commits', feature_category: :code_review do
         commit_ids = params[:commits]
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
         project = merge_request.project
@@ -361,7 +370,7 @@ module API
       desc 'Show the merge request changes' do
         success Entities::MergeRequestChanges
       end
-      get ':id/merge_requests/:merge_request_iid/changes' do
+      get ':id/merge_requests/:merge_request_iid/changes', feature_category: :code_review do
         not_found!("Merge Request") unless can?(current_user, :read_merge_request, user_project)
 
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
@@ -376,7 +385,7 @@ module API
       desc 'Get the merge request pipelines' do
         success Entities::Ci::PipelineBasic
       end
-      get ':id/merge_requests/:merge_request_iid/pipelines' do
+      get ':id/merge_requests/:merge_request_iid/pipelines', feature_category: :continuous_integration do
         pipelines = merge_request_pipelines_with_access
 
         not_found!("Merge Request") unless can?(current_user, :read_merge_request, user_project)
@@ -387,7 +396,7 @@ module API
       desc 'Create a pipeline for merge request' do
         success ::API::Entities::Ci::Pipeline
       end
-      post ':id/merge_requests/:merge_request_iid/pipelines' do
+      post ':id/merge_requests/:merge_request_iid/pipelines', feature_category: :continuous_integration do
         pipeline = ::MergeRequests::CreatePipelineService
           .new(user_project, current_user, allow_duplicate: true)
           .execute(find_merge_request_with_access(params[:merge_request_iid]))
@@ -415,7 +424,7 @@ module API
         use :optional_params
         at_least_one_of(*::API::MergeRequests.update_params_at_least_one_of)
       end
-      put ':id/merge_requests/:merge_request_iid' do
+      put ':id/merge_requests/:merge_request_iid', feature_category: :code_review do
         Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20772')
 
         merge_request = find_merge_request_with_access(params.delete(:merge_request_iid), :update_merge_request)
@@ -450,7 +459,7 @@ module API
         optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
         optional :squash, type: Grape::API::Boolean, desc: 'When true, the commits will be squashed into a single commit on merge'
       end
-      put ':id/merge_requests/:merge_request_iid/merge' do
+      put ':id/merge_requests/:merge_request_iid/merge', feature_category: :code_review do
         Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/4796')
 
         merge_request = find_project_merge_request(params[:merge_request_iid])
@@ -491,7 +500,7 @@ module API
       end
 
       desc 'Returns the up to date merge-ref HEAD commit'
-      get ':id/merge_requests/:merge_request_iid/merge_ref' do
+      get ':id/merge_requests/:merge_request_iid/merge_ref', feature_category: :code_review do
         merge_request = find_project_merge_request(params[:merge_request_iid])
 
         result = ::MergeRequests::MergeabilityCheckService.new(merge_request).execute(recheck: true)
@@ -506,7 +515,7 @@ module API
       desc 'Cancel merge if "Merge When Pipeline Succeeds" is enabled' do
         success Entities::MergeRequest
       end
-      post ':id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds' do
+      post ':id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds', feature_category: :code_review do
         merge_request = find_project_merge_request(params[:merge_request_iid])
 
         unauthorized! unless merge_request.can_cancel_auto_merge?(current_user)
@@ -520,7 +529,7 @@ module API
       params do
         optional :skip_ci, type: Boolean, desc: 'Do not create CI pipeline'
       end
-      put ':id/merge_requests/:merge_request_iid/rebase' do
+      put ':id/merge_requests/:merge_request_iid/rebase', feature_category: :code_review do
         merge_request = find_project_merge_request(params[:merge_request_iid])
 
         authorize_push_to_merge_request!(merge_request)
@@ -539,7 +548,7 @@ module API
       params do
         use :pagination
       end
-      get ':id/merge_requests/:merge_request_iid/closes_issues' do
+      get ':id/merge_requests/:merge_request_iid/closes_issues', feature_category: :code_review do
         merge_request = find_merge_request_with_access(params[:merge_request_iid])
         issues = ::Kaminari.paginate_array(merge_request.visible_closing_issues_for(current_user))
         issues = paginate(issues)