summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-27 08:58:45 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-27 08:58:57 +0000
commit01e158d0eb6d238c7bddc657c0a588c5d9cc95a8 (patch)
treea630bcf87eec8fc7dd9cd9ea51f35bb80a105ee4 /lib
parentce8500b9939b185913ca299f5a227492680b9d68 (diff)
downloadgitlab-ce-01e158d0eb6d238c7bddc657c0a588c5d9cc95a8.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-11-stable-ee
Diffstat (limited to 'lib')
-rw-r--r--lib/api/issues.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 4f2ac73c0d3..c844655f0b3 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -249,7 +249,6 @@ module API
authorize! :create_issue, user_project
issue_params = declared_params(include_missing: false)
- issue_params[:system_note_timestamp] = params[:created_at]
issue_params = convert_parameters_from_legacy_format(issue_params)
@@ -293,8 +292,6 @@ module API
issue = user_project.issues.find_by!(iid: params.delete(:issue_iid))
authorize! :update_issue, issue
- issue.system_note_timestamp = params[:updated_at]
-
update_params = declared_params(include_missing: false).merge(request: request, api: true)
update_params = convert_parameters_from_legacy_format(update_params)