Commit 24c49658 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'if-10137-ee_specific_lines_groups_api' into 'master'

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

See merge request gitlab-org/gitlab-ce!28467
parents 5e2d1eb8 03137950
...@@ -20,20 +20,19 @@ module API ...@@ -20,20 +20,19 @@ module API
optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group' optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
end end
if Gitlab.ee? params :optional_params_ee do
params :optional_params_ee do end
optional :membership_lock, type: Boolean, desc: 'Prevent adding new members to project membership within this group'
optional :ldap_cn, type: String, desc: 'LDAP Common Name' params :optional_update_params_ee do
optional :ldap_access, type: Integer, desc: 'A valid access level'
optional :shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Pipeline minutes quota for this group'
optional :extra_shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Extra pipeline minutes quota for this group'
all_or_none_of :ldap_cn, :ldap_access
end
end end
end
include ::API::Helpers::GroupsHelpers
helpers do
params :optional_params do params :optional_params do
use :optional_params_ce use :optional_params_ce
use :optional_params_ee if Gitlab.ee? use :optional_params_ee
end end
params :statistics_params do params :statistics_params do
...@@ -176,10 +175,7 @@ module API ...@@ -176,10 +175,7 @@ module API
optional :name, type: String, desc: 'The name of the group' optional :name, type: String, desc: 'The name of the group'
optional :path, type: String, desc: 'The path of the group' optional :path, type: String, desc: 'The path of the group'
use :optional_params use :optional_params
use :optional_update_params_ee
if Gitlab.ee?
optional :file_template_project_id, type: Integer, desc: 'The ID of a project to use for custom templates in this group'
end
end end
put ':id' do put ':id' do
group = find_group!(params[:id]) group = find_group!(params[:id])
......
# frozen_string_literal: true
module API
module Helpers
module GroupsHelpers
extend ActiveSupport::Concern
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