summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-03-25 11:08:20 +0100
committerMałgorzata Ksionek <meksionek@gmail.com>2019-03-25 11:17:26 +0100
commit38c135e7e5756ce549657f0e4368a5fffad14727 (patch)
tree86d2c8e3c89b71efe76c1f4c5f3b4e7318776a67
parentf88323386ae4a389d799720891ed90c58843eec6 (diff)
downloadgitlab-ce-38c135e7e5756ce549657f0e4368a5fffad14727.tar.gz
Add cr remarks
-rw-r--r--app/controllers/projects_controller.rb6
-rw-r--r--changelogs/unreleased/security-mass-assignment-on-project-update.yml2
-rw-r--r--spec/controllers/projects_controller_spec.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b419d669544..f76e6663995 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -328,9 +328,9 @@ class ProjectsController < Projects::ApplicationController
end
# rubocop: enable CodeReuse/ActiveRecord
- def project_params(attributes: project_params_attributes)
+ def project_params(attributes: [])
params.require(:project)
- .permit(attributes)
+ .permit(project_params_attributes + attributes)
end
def project_params_attributes
@@ -375,7 +375,7 @@ class ProjectsController < Projects::ApplicationController
end
def project_params_create_attributes
- project_params_attributes << :namespace_id
+ [:namespace_id]
end
def custom_import_params
diff --git a/changelogs/unreleased/security-mass-assignment-on-project-update.yml b/changelogs/unreleased/security-mass-assignment-on-project-update.yml
index 8657dcdd135..93561cd91b3 100644
--- a/changelogs/unreleased/security-mass-assignment-on-project-update.yml
+++ b/changelogs/unreleased/security-mass-assignment-on-project-update.yml
@@ -1,5 +1,5 @@
---
-title: Disallow updating namespace during updating project
+title: Disallow updating namespace when updating a project
merge_request:
author:
type: security
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 41380e79305..717675d1d30 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -383,7 +383,7 @@ describe ProjectsController do
id: project.id,
project: params
}
- end.not_to change {project.namespace}
+ end.not_to change {project.reload.namespace}
end
def update_project(**parameters)