Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
48cbe1e6
Commit
48cbe1e6
authored
Apr 05, 2022
by
Małgorzata Ksionek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify the changes
parent
3211000d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/lib/ee/api/groups.rb
ee/lib/ee/api/groups.rb
+2
-2
lib/api/groups.rb
lib/api/groups.rb
+2
-2
No files found.
ee/lib/ee/api/groups.rb
View file @
48cbe1e6
...
...
@@ -86,7 +86,7 @@ module EE
resource
:groups
,
requirements:
::
API
::
API
::
NAMESPACE_OR_PROJECT_REQUIREMENTS
do
desc
'Sync a group with LDAP.'
post
":id/ldap_sync"
,
feature_category: :
authentication_and_authorization
do
post
":id/ldap_sync"
,
feature_category: :
subgroups
do
not_found!
unless
::
Gitlab
::
Auth
::
Ldap
::
Config
.
group_sync_enabled?
group
=
find_group!
(
params
[
:id
])
...
...
@@ -172,7 +172,7 @@ module EE
use
:pagination
end
# rubocop: disable CodeReuse/ActiveRecord
get
':id/provisioned_users'
,
feature_category: :
authentication_and_authorization
do
get
':id/provisioned_users'
,
feature_category: :
subgroups
do
authorize!
:maintainer_access
,
user_group
finder
=
::
Auth
::
ProvisionedUsersFinder
.
new
(
...
...
lib/api/groups.rb
View file @
48cbe1e6
...
...
@@ -298,7 +298,7 @@ module API
use
:with_custom_attributes
use
:optional_projects_params
end
get
":id/projects"
,
feature_category: :
project
s
do
get
":id/projects"
,
feature_category: :
subgroup
s
do
finder_options
=
{
only_owned:
!
params
[
:with_shared
],
include_subgroups:
params
[
:include_subgroups
],
...
...
@@ -332,7 +332,7 @@ module API
use
:pagination
use
:with_custom_attributes
end
get
":id/projects/shared"
,
feature_category: :
project
s
do
get
":id/projects/shared"
,
feature_category: :
subgroup
s
do
projects
=
find_group_projects
(
params
,
{
only_shared:
true
})
present_projects
(
params
,
projects
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment