summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-28 07:47:35 +0000
committerRémy Coutable <remy@rymai.me>2017-03-28 07:47:35 +0000
commit2ade22dae5faeba950fb390a17e9b6d27c264ad3 (patch)
tree9af81bf8c7e07e8f60b0af662de8e1d9c9492ce5
parentd4c99f644a2da2aa340aee8bc10c1dcf7c9e0d18 (diff)
parentddd97f3c91c880d78846b72f7d9cb6c6a5dda5e7 (diff)
downloadgitlab-ce-2ade22dae5faeba950fb390a17e9b6d27c264ad3.tar.gz
Merge branch '23363-use-strong-params-in-wikis-controller' into 'master'
Update wikis_controller.rb to use strong params Closes #23363 See merge request !10240
-rw-r--r--app/controllers/projects/wikis_controller.rb2
-rw-r--r--changelogs/unreleased/23363-use-strong-params-in-wikis-controller.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index f210f7e61d2..c5e24b9e365 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -124,6 +124,6 @@ class Projects::WikisController < Projects::ApplicationController
end
def wiki_params
- params[:wiki].slice(:title, :content, :format, :message)
+ params.require(:wiki).permit(:title, :content, :format, :message)
end
end
diff --git a/changelogs/unreleased/23363-use-strong-params-in-wikis-controller.yml b/changelogs/unreleased/23363-use-strong-params-in-wikis-controller.yml
new file mode 100644
index 00000000000..dd342d38fef
--- /dev/null
+++ b/changelogs/unreleased/23363-use-strong-params-in-wikis-controller.yml
@@ -0,0 +1,4 @@
+---
+title: Update wikis_controller.rb to use strong params
+merge_request:
+author: