Commit e0ec556b authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '348117-foss-failure-on-rspec-spec-controllers-every_controller_spec-rb' into 'master'

Resolve a FOSS spec failure

See merge request gitlab-org/gitlab!76508
parents dc506f52 a69f40d5
...@@ -83,8 +83,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -83,8 +83,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
:ci_environments_status, :ci_environments_status,
:destroy, :destroy,
:rebase, :rebase,
:discussions, :discussions
:description_diff
] ]
def index def index
......
...@@ -33,6 +33,7 @@ module EE ...@@ -33,6 +33,7 @@ module EE
feature_category :code_review, [:delete_description_version, :description_diff] feature_category :code_review, [:delete_description_version, :description_diff]
urgency :high, [:delete_description_version] urgency :high, [:delete_description_version]
urgency :low, [:description_diff]
end end
def can_run_sast_experiments_on?(project) def can_run_sast_experiments_on?(project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment