Merge branch 'ce-7927-filter-none-any-weight-issues-api' into 'master'
Split CE and EE params in issues API See merge request gitlab-org/gitlab-ce!22689
This commit is contained in:
commit
e62168fcae
1 changed files with 13 additions and 4 deletions
|
@ -8,6 +8,15 @@ module API
|
|||
|
||||
helpers ::Gitlab::IssuableMetadata
|
||||
|
||||
# EE::API::Issues would override the following helpers
|
||||
helpers do
|
||||
params :issues_params_ee do
|
||||
end
|
||||
|
||||
params :issue_params_ee do
|
||||
end
|
||||
end
|
||||
|
||||
helpers do
|
||||
# rubocop: disable CodeReuse/ActiveRecord
|
||||
def find_issues(args = {})
|
||||
|
@ -46,9 +55,11 @@ module API
|
|||
desc: 'Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`'
|
||||
optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
|
||||
use :pagination
|
||||
|
||||
use :issues_params_ee
|
||||
end
|
||||
|
||||
params :issue_params_ce do
|
||||
params :issue_params do
|
||||
optional :description, type: String, desc: 'The description of an issue'
|
||||
optional :assignee_ids, type: Array[Integer], desc: 'The array of user IDs to assign issue'
|
||||
optional :assignee_id, type: Integer, desc: '[Deprecated] The ID of a user to assign issue'
|
||||
|
@ -57,10 +68,8 @@ module API
|
|||
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"
|
||||
end
|
||||
|
||||
params :issue_params do
|
||||
use :issue_params_ce
|
||||
use :issue_params_ee
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue