diff options
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 295213bd38c..5d38e431c8a 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -50,10 +50,9 @@ class Projects::IssuesController < Projects::ApplicationController end before_action only: :show do - real_time_feature_flag = :real_time_issue_sidebar - real_time_enabled = Gitlab::ActionCable::Config.in_app? || Feature.enabled?(real_time_feature_flag, @project) + real_time_enabled = Gitlab::ActionCable::Config.in_app? || Feature.enabled?(:real_time_issue_sidebar, @project) - push_to_gon_attributes(:features, real_time_feature_flag, real_time_enabled) + push_to_gon_attributes(:features, :real_time_issue_sidebar, real_time_enabled) push_frontend_feature_flag(:confidential_notes, @project, default_enabled: :yaml) push_frontend_feature_flag(:issue_assignees_widget, @project, default_enabled: :yaml) push_frontend_feature_flag(:labels_widget, @project, default_enabled: :yaml) @@ -130,12 +129,14 @@ class Projects::IssuesController < Projects::ApplicationController end def create - create_params = issue_params.merge(spammable_params).merge( + extract_legacy_spam_params_to_headers + create_params = issue_params.merge( merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of], discussion_to_resolve: params[:discussion_to_resolve] ) - service = ::Issues::CreateService.new(project: project, current_user: current_user, params: create_params) + spam_params = ::Spam::SpamParams.new_from_request(request: request) + service = ::Issues::CreateService.new(project: project, current_user: current_user, params: create_params, spam_params: spam_params) @issue = service.execute create_vulnerability_issue_feedback(issue) @@ -335,8 +336,8 @@ class Projects::IssuesController < Projects::ApplicationController end def update_service - update_params = issue_params.merge(spammable_params) - ::Issues::UpdateService.new(project: project, current_user: current_user, params: update_params) + spam_params = ::Spam::SpamParams.new_from_request(request: request) + ::Issues::UpdateService.new(project: project, current_user: current_user, params: issue_params, spam_params: spam_params) end def finder_type |