Merge branch 'rs-project_params-ee' into 'master'

Apply `*_params_ce << *_params_ee` pattern to ProjectsController

See merge request !852

app/controllers/projects/merge_requests_controller.rb

@@ -647,7 +647,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def merge_request_params
     params.require(:merge_request)
-      .permit(merge_request_params_ce + merge_request_params_ee)
+      .permit(merge_request_params_ce << merge_request_params_ee)
   end
 
   def merge_request_params_ce

app/controllers/projects_controller.rb

@@ -319,39 +319,60 @@ 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 << project_params_ee)
+  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,
-
-      # EE-only
-      :approvals_before_merge,
-      :approver_ids,
-      :approver_group_ids,
-      :issues_template,
-      :merge_method,
-      :merge_requests_template,
-      :mirror,
-      :mirror_user_id,
-      :mirror_trigger_builds,
-      :repository_size_limit,
-      :reset_approvals_on_push
-    )
+      :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 project_params_ee
+    %i[
+      approvals_before_merge
+      approver_group_ids
+      approver_ids
+      issues_template
+      merge_method
+      merge_requests_template
+      mirror
+      mirror_trigger_builds
+      mirror_user_id
+      repository_size_limit
+      reset_approvals_on_push
+    ]
   end
 
   def repo_exists?