Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
656e4057
Unverified
Commit
656e4057
authored
Jan 19, 2021
by
Ahmad Farhat
Committed by
GitHub
Jan 19, 2021
Browse files
Options
Downloads
Patches
Plain Diff
Fixed 400 with share room and merge user (#2448)
parent
957bf88a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/admins_controller.rb
+1
-2
1 addition, 2 deletions
app/controllers/admins_controller.rb
app/controllers/users_controller.rb
+1
-2
1 addition, 2 deletions
app/controllers/users_controller.rb
with
2 additions
and
4 deletions
app/controllers/admins_controller.rb
+
1
−
2
View file @
656e4057
...
...
@@ -209,13 +209,12 @@ class AdminsController < ApplicationController
initial_list
=
User
.
without_role
(
:super_admin
)
.
where
.
not
(
uid:
current_user
.
uid
)
.
merge_list_search
(
params
[
:search
])
.
pluck_to_hash
(
:uid
,
:name
,
:email
)
initial_list
=
initial_list
.
where
(
provider:
@user_domain
)
if
Rails
.
configuration
.
loadbalanced_configuration
# Respond with JSON object of users
respond_to
do
|
format
|
format
.
json
{
render
body:
initial_list
.
to_json
}
format
.
json
{
render
body:
initial_list
.
pluck_to_hash
(
:uid
,
:name
,
:email
).
to_json
}
end
end
...
...
This diff is collapsed.
Click to expand it.
app/controllers/users_controller.rb
+
1
−
2
View file @
656e4057
...
...
@@ -212,13 +212,12 @@ class UsersController < ApplicationController
initial_list
=
User
.
where
.
not
(
uid:
params
[
:owner_uid
])
.
with_role
(
roles_can_appear
)
.
shared_list_search
(
params
[
:search
])
.
pluck_to_hash
(
:uid
,
:name
)
initial_list
=
initial_list
.
where
(
provider:
@user_domain
)
if
Rails
.
configuration
.
loadbalanced_configuration
# Respond with JSON object of users
respond_to
do
|
format
|
format
.
json
{
render
body:
initial_list
.
to_json
}
format
.
json
{
render
body:
initial_list
.
pluck_to_hash
(
:uid
,
:name
).
to_json
}
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment