Commit ce8b9221 authored by Sean McGivern's avatar Sean McGivern
Browse files

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
......@@ -8,6 +8,15 @@ class Issues < Grape::API
helpers ::Gitlab::IssuableMetadata
# EE::API::Issues would override the following helpers
helpers do
params :issues_params_ee do
params :issue_params_ee do
helpers do
# rubocop: disable CodeReuse/ActiveRecord
def find_issues(args = {})
......@@ -46,9 +55,11 @@ def find_issues(args = {})
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
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 @@ def find_issues(args = {})
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"
params :issue_params do
use :issue_params_ce
use :issue_params_ee
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