diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-14 17:10:22 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 17:10:22 +0300 |
commit | 3c9318a8c58f638f57cfe86cb2f84625445996c8 (patch) | |
tree | 5f8274e25f637132f7085df2173f3996a049e894 /Gemfile.lock | |
parent | c3bb21ff800699bed829a30c75fa81fd0d4dab8d (diff) | |
parent | 8559a900641806b54a78737679060099e34b2baa (diff) |
Merge branch 'use-hashie-forbidden_attributes' into 'master'
Use the hashie-forbideen_attributes gem
Closes #26400
See merge request !10579
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d7e3f7343d0..bb91db1e805 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -346,6 +346,8 @@ GEM tilt hashdiff (0.3.2) hashie (3.5.5) + hashie-forbidden_attributes (0.1.1) + hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) hipchat (1.5.2) @@ -915,6 +917,7 @@ DEPENDENCIES grape-entity (~> 0.6.0) haml_lint (~> 0.21.0) hamlit (~> 2.6.1) + hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) @@ -1035,4 +1038,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.14.5 + 1.14.6 |