diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-02 21:27:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-02 21:28:10 +0000 |
| commit | 35a9ba2148ce4cb992e6f69e8797891d507ecbd5 (patch) | |
| tree | 677fbdb49db10091066e5fc1104f5daa7161c48b /app/services | |
| parent | 1bae6f29f2381374f5ad1300e70111294989ce9c (diff) | |
| download | gitlab-ce-35a9ba2148ce4cb992e6f69e8797891d507ecbd5.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-1-stable-ee
Diffstat (limited to 'app/services')
| -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 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 |