diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-11-07 17:55:20 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-07 17:55:20 +0000 |
commit | d59956afc02e66b46045d733b6d48014a7818d24 (patch) | |
tree | 4315f3648bc4753f42c2452879a8a3eacd238bb5 | |
parent | 87afcdff9ca0a21d2529cbd198d49c21b83320f9 (diff) | |
download | gitlab-ce-rs-project_params.tar.gz |
Apply `*_params_ce` pattern to ProjectsControllerrs-project_params
-rw-r--r-- | app/controllers/projects_controller.rb | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6988527a3be..0620b3df637 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -318,26 +318,44 @@ class ProjectsController < Projects::ApplicationController end def project_params - project_feature_attributes = - { - project_feature_attributes: - [ - :issues_access_level, :builds_access_level, - :wiki_access_level, :merge_requests_access_level, - :snippets_access_level, :repository_access_level - ] - } + params.require(:project) + .permit(project_params_ce) + end - params.require(:project).permit( - :name, :path, :description, :issues_tracker, :tag_list, :runners_token, + def project_params_ce + [ + :avatar, + :build_allow_git_fetch, + :build_coverage_regex, + :build_timeout_in_minutes, :container_registry_enabled, - :issues_tracker_id, :default_branch, - :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar, - :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, - :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled, + :default_branch, + :description, + :import_url, + :issues_tracker, + :issues_tracker_id, + :last_activity_at, + :lfs_enabled, + :name, + :namespace_id, :only_allow_merge_if_all_discussions_are_resolved, - :lfs_enabled, project_feature_attributes - ) + :only_allow_merge_if_build_succeeds, + :path, + :public_builds, + :request_access_enabled, + :runners_token, + :tag_list, + :visibility_level, + + project_feature_attributes: %i[ + builds_access_level + issues_access_level + merge_requests_access_level + repository_access_level + snippets_access_level + wiki_access_level + ] + ] end def repo_exists? |