Commit 2a067bb3 authored by Sean McGivern's avatar Sean McGivern
Browse files

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

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

See merge request !13022
......@@ -76,11 +76,11 @@ def application_setting_params
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,
......
......@@ -22,6 +22,7 @@ def redirect_git_extension
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? }
......
......@@ -296,10 +296,10 @@ def load_events
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,
......
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