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
e5ddd6d2
Commit
e5ddd6d2
authored
May 04, 2016
by
Andrei Gliga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsController
parent
ca288587
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+11
-1
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
e5ddd6d2
...
@@ -53,6 +53,15 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -53,6 +53,15 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end
end
end
end
disabled_oauth_sign_in_sources
=
params
[
:application_setting
][
:disabled_oauth_sign_in_sources
]
if
disabled_oauth_sign_in_sources
.
nil?
params
[
:application_setting
][
:disabled_oauth_sign_in_sources
]
=
[]
else
disabled_oauth_sign_in_sources
.
map!
do
|
source
|
source
.
to_str
end
end
params
.
require
(
:application_setting
).
permit
(
params
.
require
(
:application_setting
).
permit
(
:default_projects_limit
,
:default_projects_limit
,
:default_branch_protection
,
:default_branch_protection
,
...
@@ -95,7 +104,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -95,7 +104,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:repository_checks_enabled
,
:repository_checks_enabled
,
:metrics_packet_size
,
:metrics_packet_size
,
restricted_visibility_levels:
[],
restricted_visibility_levels:
[],
import_sources:
[]
import_sources:
[],
disabled_oauth_sign_in_sources:
[]
)
)
end
end
end
end
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