diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-03 00:28:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-03 00:28:54 +0300 |
| commit | f4fbe9d60f1591a4900c9df5434bc41f86afb36b (patch) | |
| tree | e6f986a4b4abc09be495d6786a8ef12fe53a01f1 /app | |
| parent | ca0b403f0ad83a619f120b3ac73816770f94433d (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/issues/base_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 72e906e20f1..dae1e557249 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -47,6 +47,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 |