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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
dafd5531
Commit
dafd5531
authored
Jan 10, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor authorized params in Admin::ApplicationSettingsController
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
34087fe3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
70 additions
and
45 deletions
+70
-45
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+70
-45
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
dafd5531
...
@@ -67,69 +67,94 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -67,69 +67,94 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params
.
delete
(
:domain_blacklist_raw
)
if
params
[
:domain_blacklist_file
]
params
.
delete
(
:domain_blacklist_raw
)
if
params
[
:domain_blacklist_file
]
params
.
require
(
:application_setting
).
permit
(
params
.
require
(
:application_setting
).
permit
(
:default_projects_limit
,
application_setting_params_ce
:default_branch_protection
,
)
:signup_enabled
,
end
:signin_enabled
,
:require_two_factor_authentication
,
def
application_setting_params_ce
:two_factor_grace_period
,
[
:gravatar_enabled
,
:admin_notification_email
,
:sign_in_text
,
:after_sign_up_text
,
:help_page_text
,
:home_page_url
,
:after_sign_out_path
,
:after_sign_out_path
,
:max_attachment_size
,
:after_sign_up_text
,
:session_expire_delay
,
:akismet_api_key
,
:akismet_enabled
,
:container_registry_token_expire_delay
,
:default_branch_protection
,
:default_group_visibility
,
:default_project_visibility
,
:default_project_visibility
,
:default_projects_limit
,
:default_snippet_visibility
,
:default_snippet_visibility
,
:default_group_visibility
,
:domain_whitelist_raw
,
:domain_blacklist_enabled
,
:domain_blacklist_enabled
,
:domain_blacklist_raw
,
:domain_blacklist_file
,
:domain_blacklist_file
,
:version_check_enabled
,
:domain_blacklist_raw
,
:admin_notification_email
,
:domain_whitelist_raw
,
:user_oauth_applications
,
:user_default_external
,
:email_author_in_body
,
:shared_runners_enabled
,
:enabled_git_access_protocol
,
:shared_runners_text
,
:gravatar_enabled
,
:help_page_text
,
:home_page_url
,
:housekeeping_bitmaps_enabled
,
:housekeeping_enabled
,
:housekeeping_full_repack_period
,
:housekeeping_gc_period
,
:housekeeping_incremental_repack_period
,
:html_emails_enabled
,
:koding_enabled
,
:koding_url
,
:max_artifacts_size
,
:max_artifacts_size
,
:max_attachment_size
,
:metrics_enabled
,
:metrics_enabled
,
:metrics_host
,
:metrics_host
,
:metrics_port
,
:metrics_pool_size
,
:metrics_timeout
,
:metrics_method_call_threshold
,
:metrics_method_call_threshold
,
:metrics_packet_size
,
:metrics_pool_size
,
:metrics_port
,
:metrics_sample_interval
,
:metrics_sample_interval
,
:metrics_timeout
,
:recaptcha_enabled
,
:recaptcha_enabled
,
:recaptcha_site_key
,
:recaptcha_private_key
,
:recaptcha_private_key
,
:sentry_enabled
,
:recaptcha_site_key
,
:sentry_dsn
,
:akismet_enabled
,
:akismet_api_key
,
:koding_enabled
,
:koding_url
,
:email_author_in_body
,
:html_emails_enabled
,
:repository_checks_enabled
,
:repository_checks_enabled
,
:metrics_packet_size
,
:require_two_factor_authentication
,
:session_expire_delay
,
:sign_in_text
,
:signin_enabled
,
:signup_enabled
,
:sentry_dsn
,
:sentry_enabled
,
:send_user_confirmation_email
,
:send_user_confirmation_email
,
:container_registry_token_expire_delay
,
:enabled_git_access_protocol
,
:shared_runners_enabled
,
:shared_runners_text
,
:sidekiq_throttling_enabled
,
:sidekiq_throttling_enabled
,
:sidekiq_throttling_factor
,
:sidekiq_throttling_factor
,
:housekeeping_enabled
,
:housekeeping_bitmaps_enabled
,
:two_factor_grace_period
,
:housekeeping_incremental_repack_period
,
:user_default_external
,
:housekeeping_full_repack_period
,
:user_oauth_applications
,
:housekeeping_gc_period
,
:version_check_enabled
,
disabled_oauth_sign_in_sources:
[],
import_sources:
[],
repository_storages:
[],
repository_storages:
[],
restricted_visibility_levels:
[],
restricted_visibility_levels:
[],
import_sources:
[],
disabled_oauth_sign_in_sources:
[],
sidekiq_throttling_queues:
[]
sidekiq_throttling_queues:
[]
)
]
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