summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-14 15:42:10 +0100
committerPhil Hughes <me@iamphill.com>2017-04-14 15:42:10 +0100
commit302e855f52b5d914e64bf6fbcc7e6544904c4e77 (patch)
tree10ec4d64d0136080685a8d93e5c0d0c324c54f23 /Gemfile
parent72fefba4c18e2464725231b3426ec2e3b0eda9c4 (diff)
parent3c9318a8c58f638f57cfe86cb2f84625445996c8 (diff)
downloadgitlab-ce-302e855f52b5d914e64bf6fbcc7e6544904c4e77.tar.gz
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index e98c127d2f5..6c1f6346071 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,6 +73,9 @@ gem 'grape', '~> 0.19.0'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
+# Disable strong_params so that Mash does not respond to :permitted?
+gem 'hashie-forbidden_attributes'
+
# Pagination
gem 'kaminari', '~> 0.17.0'