summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-22 14:43:17 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-22 14:43:17 -0600
commit02913a96359938f58743ac962f9b16081db92ffc (patch)
tree203d2877db97e02eca6ca0e9307024deedb7a624 /Gemfile.lock
parent9ccfac275f203459c67290ab3d5f69ac09085276 (diff)
downloadgitlab-ce-02913a96359938f58743ac962f9b16081db92ffc.tar.gz
Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gon
Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 195516d1bf1..1d8d55b848d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -299,7 +299,7 @@ GEM
gollum-rugged_adapter (0.4.2)
mime-types (>= 1.15)
rugged (~> 0.24.0, >= 0.21.3)
- gon (6.0.1)
+ gon (6.1.0)
actionpack (>= 3.0)
json
multi_json
@@ -571,7 +571,7 @@ GEM
redis-store (~> 1.1.0)
redis-store (1.1.7)
redis (>= 2.2)
- request_store (1.3.0)
+ request_store (1.3.1)
rerun (0.11.0)
listen (~> 3.0)
responders (2.1.1)
@@ -866,7 +866,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2)
- gon (~> 6.0.1)
+ gon (~> 6.1.0)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)
hamlit (~> 2.5)