Commit 2815859c authored by Jonathan Schafer's avatar Jonathan Schafer

Use separate merge for confidential issue

parent 7d03bacf
...@@ -104,9 +104,8 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -104,9 +104,8 @@ class Projects::IssuesController < Projects::ApplicationController
) )
build_params = issue_create_params.merge( build_params = issue_create_params.merge(
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of], merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
discussion_to_resolve: params[:discussion_to_resolve], discussion_to_resolve: params[:discussion_to_resolve]
confidential: confidential_issue? ).merge(confidential: confidential_issue?)
)
service = ::Issues::BuildService.new(project, current_user, build_params) service = ::Issues::BuildService.new(project, current_user, build_params)
@issue = @noteable = service.execute @issue = @noteable = service.execute
...@@ -394,8 +393,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -394,8 +393,7 @@ class Projects::IssuesController < Projects::ApplicationController
end end
def confidential_issue? def confidential_issue?
!!Gitlab::Utils.to_boolean(issue_create_params[:confidential]) || !!Gitlab::Utils.to_boolean(params[:issue][:confidential])
!!Gitlab::Utils.to_boolean(params[:issue][:confidential])
end end
def run_null_hypothesis_experiment def run_null_hypothesis_experiment
......
...@@ -68,8 +68,7 @@ module EE ...@@ -68,8 +68,7 @@ module EE
def vulnerability_issue_build_parameters def vulnerability_issue_build_parameters
{ {
title: _("Investigate vulnerability: %{title}") % { title: vulnerability.title }, title: _("Investigate vulnerability: %{title}") % { title: vulnerability.title },
description: render_vulnerability_description, description: render_vulnerability_description
confidential: true
} }
end end
...@@ -90,6 +89,11 @@ module EE ...@@ -90,6 +89,11 @@ module EE
def populate_vulnerability_id def populate_vulnerability_id
self.vulnerability_id = params[:vulnerability_id] if can?(current_user, :read_vulnerability, project) self.vulnerability_id = params[:vulnerability_id] if can?(current_user, :read_vulnerability, project)
end end
override :confidential_issue?
def confidential_issue?
vulnerability_id.present? || super
end
end end
end end
end end
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