Merge branch 'if-10137-ee_specific_lines_issues_api' into 'master'
CE port of Move EE specific lines in API::Issues See merge request gitlab-org/gitlab-ce!28725
This commit is contained in:
commit
d1de15c1a0
2 changed files with 10 additions and 12 deletions
|
@ -3,6 +3,14 @@
|
|||
module API
|
||||
module Helpers
|
||||
module IssuesHelpers
|
||||
extend Grape::API::Helpers
|
||||
|
||||
params :optional_issue_params_ee do
|
||||
end
|
||||
|
||||
params :optional_issues_params_ee do
|
||||
end
|
||||
|
||||
def self.update_params_at_least_one_of
|
||||
[
|
||||
:assignee_id,
|
||||
|
|
|
@ -9,16 +9,6 @@ module API
|
|||
before { authenticate_non_get! }
|
||||
|
||||
helpers do
|
||||
if Gitlab.ee?
|
||||
params :issues_params_ee do
|
||||
optional :weight, types: [Integer, String], integer_none_any: true, desc: 'The weight of the issue'
|
||||
end
|
||||
|
||||
params :issue_params_ee do
|
||||
optional :weight, type: Integer, desc: 'The weight of the issue'
|
||||
end
|
||||
end
|
||||
|
||||
params :issues_stats_params do
|
||||
optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
|
||||
optional :milestone, type: String, desc: 'Milestone title'
|
||||
|
@ -47,7 +37,7 @@ module API
|
|||
optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
|
||||
optional :confidential, type: Boolean, desc: 'Filter confidential or public issues'
|
||||
|
||||
use :issues_params_ee if Gitlab.ee?
|
||||
use :optional_issues_params_ee
|
||||
end
|
||||
|
||||
params :issues_params do
|
||||
|
@ -73,7 +63,7 @@ module API
|
|||
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"
|
||||
|
||||
use :issue_params_ee if Gitlab.ee?
|
||||
use :optional_issue_params_ee
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue