summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 21:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 21:09:09 +0000
commit1902e256266822bc94e1a69debd79fb256de2d79 (patch)
tree2a6a431d24bc7c293312cb84bdfad6a438fa4d80 /lib
parentf781b0b69368ea3181cf892305c60a22886c0d7e (diff)
downloadgitlab-ce-1902e256266822bc94e1a69debd79fb256de2d79.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers/issues_helpers.rb2
-rw-r--r--lib/api/issues.rb2
-rw-r--r--lib/api/project_export.rb2
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/helpers/issues_helpers.rb b/lib/api/helpers/issues_helpers.rb
index e272b13f3ae..638b31cc7ba 100644
--- a/lib/api/helpers/issues_helpers.rb
+++ b/lib/api/helpers/issues_helpers.rb
@@ -24,6 +24,8 @@ module API
:discussion_locked,
:due_date,
:labels,
+ :add_labels,
+ :remove_labels,
:milestone_id,
:state_event,
:title
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index be50c3e0381..de2d0b01a64 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -67,6 +67,8 @@ module API
optional :assignee_id, type: Integer, desc: '[Deprecated] The ID of a user to assign issue'
optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign issue'
optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
+ optional :add_labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
+ optional :remove_labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
optional :due_date, type: String, desc: 'Date string in the format YEAR-MONTH-DAY'
optional :confidential, type: Boolean, desc: 'Boolean parameter if the issue should be confidential'
optional :discussion_locked, type: Boolean, desc: " Boolean parameter indicating if the issue's discussion is locked"
diff --git a/lib/api/project_export.rb b/lib/api/project_export.rb
index 9fd9d13a20c..61e394048e3 100644
--- a/lib/api/project_export.rb
+++ b/lib/api/project_export.rb
@@ -45,7 +45,7 @@ module API
end
end
post ':id/export' do
- check_rate_limit! :project_export, [current_user, :project_export, user_project]
+ check_rate_limit! :project_export, [current_user, :project_export]
project_export_params = declared_params(include_missing: false)
after_export_params = project_export_params.delete(:upload) || {}