Commit f00a08c3 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rs-project_params' into 'master'

Apply `*_params_ce` pattern to ProjectsController

See merge request !7338
parents d215159d d59956af
...@@ -325,26 +325,44 @@ class ProjectsController < Projects::ApplicationController ...@@ -325,26 +325,44 @@ class ProjectsController < Projects::ApplicationController
end end
def project_params def project_params
project_feature_attributes = params.require(:project)
{ .permit(project_params_ce)
project_feature_attributes: end
[
:issues_access_level, :builds_access_level,
:wiki_access_level, :merge_requests_access_level,
:snippets_access_level, :repository_access_level
]
}
params.require(:project).permit( def project_params_ce
:name, :path, :description, :issues_tracker, :tag_list, :runners_token, [
:avatar,
:build_allow_git_fetch,
:build_coverage_regex,
:build_timeout_in_minutes,
:container_registry_enabled, :container_registry_enabled,
:issues_tracker_id, :default_branch, :default_branch,
:visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar, :description,
:build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, :import_url,
:public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled, :issues_tracker,
:issues_tracker_id,
:last_activity_at,
:lfs_enabled,
:name,
:namespace_id,
:only_allow_merge_if_all_discussions_are_resolved, :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 end
def repo_exists? def repo_exists?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment