summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-08 15:33:30 +0000
committerRémy Coutable <remy@rymai.me>2019-04-08 15:33:30 +0000
commit4317a2a3a2e39e4c2594b0b28abf7a8cc694eeab (patch)
treeb8077805258a7652e08ecce36a5532d40bf03a9c /lib
parent425377f35747131bed6550170af576d3028b28f9 (diff)
downloadgitlab-ce-4317a2a3a2e39e4c2594b0b28abf7a8cc694eeab.tar.gz
Fix `updated_at` doesn't apply to `state_event` updates of issues via API
Diffstat (limited to 'lib')
-rw-r--r--lib/api/issues.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 999a9cb5a82..000c00ea9f9 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -230,9 +230,13 @@ module API
issue = user_project.issues.find_by!(iid: params.delete(:issue_iid))
authorize! :update_issue, issue
- # Setting created_at time only allowed for admins and project/group owners
- unless current_user.admin? || user_project.owner == current_user || current_user.owned_groups.include?(user_project.owner)
- params.delete(:updated_at)
+ # Setting updated_at only allowed for admins and owners as well
+ if params[:updated_at].present?
+ if current_user.admin? || user_project.owner == current_user || current_user.owned_groups.include?(user_project.owner)
+ issue.system_note_timestamp = params[:updated_at]
+ else
+ params.delete(:updated_at)
+ end
end
update_params = declared_params(include_missing: false).merge(request: request, api: true)