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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
ed1d7e6a
Unverified
Commit
ed1d7e6a
authored
1 year ago
by
Samuel Couillard
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Add ldap and google to provider whitelist for rooms migration (#5315)
parent
6e6d6a2b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/api/v1/migrations/external_controller.rb
+5
-0
5 additions, 0 deletions
app/controllers/api/v1/migrations/external_controller.rb
with
5 additions
and
0 deletions
app/controllers/api/v1/migrations/external_controller.rb
+
5
−
0
View file @
ed1d7e6a
...
...
@@ -114,9 +114,13 @@ module Api
# shared_users_emails: [ <list of shared users emails> ] }}
# Returns: { data: Array[serializable objects] , errors: Array[String] }
# Does: Creates a Room and its RoomMeetingOptions.
# rubocop:disable Metrics/CyclomaticComplexity
def
create_room
room_hash
=
room_params
.
to_h
# Re-write LDAP and Google to greenlight
room_hash
[
:provider
]
=
%w[greenlight ldap google]
.
include?
(
room_hash
[
:provider
])
?
'greenlight'
:
room_hash
[
:provider
]
unless
room_hash
[
:provider
]
==
'greenlight'
||
Tenant
.
exists?
(
name:
room_hash
[
:provider
])
return
render_error
(
status: :bad_request
,
errors:
'Provider does not exist'
)
end
...
...
@@ -165,6 +169,7 @@ module Api
render_data
status: :created
end
# rubocop:enable Metrics/CyclomaticComplexity
# POST /api/v1/migrations/site_settings.json
# Expects: { settings: { site_settings: { :PrimaryColor, :PrimaryColorLight, :PrimaryColorDark,
...
...
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