diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-27 16:00:30 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-27 16:00:30 +0100 |
| commit | 76704c7960a880106a7ce5706cb5f3915defb8de (patch) | |
| tree | 167b92aa4db60ee47e0d3dd3133fc8656c4594d5 /app/controllers/projects_controller.rb | |
| parent | 425dbdd222244bc00cab8c2dbd6bb94233d11a15 (diff) | |
| parent | 842bcfa77700459fcd426fb11a4058d8aa103469 (diff) | |
| download | gitlab-ce-76704c7960a880106a7ce5706cb5f3915defb8de.tar.gz | |
Merge branch 'master' into ph-inline-js
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c769693255c..2d7cbd4614e 100644 --- a/app/controllers/projects_controller.rb +++ b/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, |