Skip to content

G
gitlab-ce
Commit a69f40d5 authored by Sincheol (David) Kim's avatar Sincheol (David) Kim Committed by Heinrich Lee Yu
Browse files
Options

Resolve a FOSS spec failure

parent 01dd30cc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/controllers/projects/merge_requests_controller.rb
View file @ 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
......
ee/app/controllers/ee/projects/merge_requests_controller.rb
View file @ a69f40d5
...@@ -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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7