From 35a9ba2148ce4cb992e6f69e8797891d507ecbd5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Aug 2021 21:27:54 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@14-1-stable-ee --- app/services/issues/base_service.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app') diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index bf66a33a7b2..5e0a86fdeee 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -48,6 +48,9 @@ module Issues params.delete(:created_at) unless moved_issue || current_user.can?(:set_issue_created_at, project) params.delete(:updated_at) unless moved_issue || current_user.can?(:set_issue_updated_at, project) + # Only users with permission to handle error data can add it to issues + params.delete(:sentry_issue_attributes) unless current_user.can?(:update_sentry_issue, project) + issue.system_note_timestamp = params[:created_at] || params[:updated_at] end -- cgit v1.2.3