diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 08:58:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 08:58:57 +0000 |
| commit | 01e158d0eb6d238c7bddc657c0a588c5d9cc95a8 (patch) | |
| tree | a630bcf87eec8fc7dd9cd9ea51f35bb80a105ee4 /app | |
| parent | ce8500b9939b185913ca299f5a227492680b9d68 (diff) | |
| download | gitlab-ce-01e158d0eb6d238c7bddc657c0a588c5d9cc95a8.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-11-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/issues/base_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 87615d1b4f2..07e4a10708e 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -34,7 +34,7 @@ module Issues private - def filter_params(merge_request) + def filter_params(issue) super moved_issue = params.delete(:moved_issue) @@ -44,6 +44,8 @@ module Issues params.delete(:iid) unless current_user.can?(:set_issue_iid, project) 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) + + issue.system_note_timestamp = params[:created_at] || params[:updated_at] end def create_assignee_note(issue, old_assignees) |