diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
| commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
| tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/api/issues.rb | |
| parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
| download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/api/issues.rb')
| -rw-r--r-- | lib/api/issues.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 0e5b0fae6e2..143f9e40736 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module API - class Issues < Grape::API::Instance + class Issues < ::API::Base include PaginationParams helpers Helpers::IssuesHelpers helpers Helpers::RateLimiter @@ -231,9 +231,6 @@ module API authorize! :create_issue, user_project - params.delete(:created_at) unless current_user.can?(:set_issue_created_at, user_project) - params.delete(:iid) unless current_user.can?(:set_issue_iid, user_project) - issue_params = declared_params(include_missing: false) issue_params[:system_note_timestamp] = params[:created_at] @@ -279,8 +276,6 @@ module API issue = user_project.issues.find_by!(iid: params.delete(:issue_iid)) authorize! :update_issue, issue - # Setting updated_at is allowed only for admins and owners - params.delete(:updated_at) unless current_user.can?(:set_issue_updated_at, user_project) issue.system_note_timestamp = params[:updated_at] update_params = declared_params(include_missing: false).merge(request: request, api: true) |