Merge branch 'backport-ee-2328' into 'master'

Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328

See merge request !13022

app/controllers/admin/application_settings_controller.rb

@@ -76,11 +76,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
     params.require(:application_setting).permit(
-      application_setting_params_ce
+      application_setting_params_attributes
     )
   end
-  def application_setting_params_ce
+  def application_setting_params_attributes
     [
       :admin_notification_email,
       :after_sign_out_path,

app/controllers/projects/application_controller.rb

@@ -22,6 +22,7 @@ class Projects::ApplicationController < ApplicationController
   def project
     return @project if @project
+    return nil unless params[:project_id] || params[:id]
     path = File.join(params[:namespace_id], params[:project_id] || params[:id])
     auth_proc = ->(project) { !project.pending_delete? }

app/controllers/projects_controller.rb

@@ -296,10 +296,10 @@ class ProjectsController < Projects::ApplicationController
   def project_params
     params.require(:project)
-      .permit(project_params_ce)
+      .permit(project_params_attributes)
   end
-  def project_params_ce
+  def project_params_attributes
     [
       :avatar,
       :build_allow_git_fetch,