Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
This commit is contained in:
parent
2209426f7b
commit
e4391c7190
3 changed files with 5 additions and 4 deletions
|
@ -76,11 +76,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
|
||||||
params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
|
params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
|
||||||
|
|
||||||
params.require(:application_setting).permit(
|
params.require(:application_setting).permit(
|
||||||
application_setting_params_ce
|
application_setting_params_attributes
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def application_setting_params_ce
|
def application_setting_params_attributes
|
||||||
[
|
[
|
||||||
:admin_notification_email,
|
:admin_notification_email,
|
||||||
:after_sign_out_path,
|
:after_sign_out_path,
|
||||||
|
|
|
@ -22,6 +22,7 @@ class Projects::ApplicationController < ApplicationController
|
||||||
|
|
||||||
def project
|
def project
|
||||||
return @project if @project
|
return @project if @project
|
||||||
|
return nil unless params[:project_id] || params[:id]
|
||||||
|
|
||||||
path = File.join(params[:namespace_id], params[:project_id] || params[:id])
|
path = File.join(params[:namespace_id], params[:project_id] || params[:id])
|
||||||
auth_proc = ->(project) { !project.pending_delete? }
|
auth_proc = ->(project) { !project.pending_delete? }
|
||||||
|
|
|
@ -296,10 +296,10 @@ class ProjectsController < Projects::ApplicationController
|
||||||
|
|
||||||
def project_params
|
def project_params
|
||||||
params.require(:project)
|
params.require(:project)
|
||||||
.permit(project_params_ce)
|
.permit(project_params_attributes)
|
||||||
end
|
end
|
||||||
|
|
||||||
def project_params_ce
|
def project_params_attributes
|
||||||
[
|
[
|
||||||
:avatar,
|
:avatar,
|
||||||
:build_allow_git_fetch,
|
:build_allow_git_fetch,
|
||||||
|
|
Loading…
Reference in a new issue