Commit 80832062 authored by Imre Farkas's avatar Imre Farkas Committed by Yorick Peterse

CE port of Move EE specific lines in API::Issues

parent 328740c6
...@@ -3,6 +3,14 @@ ...@@ -3,6 +3,14 @@
module API module API
module Helpers module Helpers
module IssuesHelpers 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 def self.update_params_at_least_one_of
[ [
:assignee_id, :assignee_id,
......
...@@ -9,16 +9,6 @@ module API ...@@ -9,16 +9,6 @@ module API
before { authenticate_non_get! } before { authenticate_non_get! }
helpers do 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 params :issues_stats_params do
optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names' 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' optional :milestone, type: String, desc: 'Milestone title'
...@@ -47,7 +37,7 @@ module API ...@@ -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 :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' optional :confidential, type: Boolean, desc: 'Filter confidential or public issues'
use :issues_params_ee if Gitlab.ee? use :optional_issues_params_ee
end end
params :issues_params do params :issues_params do
...@@ -73,7 +63,7 @@ module API ...@@ -73,7 +63,7 @@ module API
optional :confidential, type: Boolean, desc: 'Boolean parameter if the issue should be confidential' 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" 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
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment