Commit 0d022db5 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'cs-upgrade-gon' into 'master'

Upgrade gon from 6.0.1 to 6.1.0.

Removes methods that were deprecated in Rails 5. Working toward #14286.

Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9

See merge request !5442
parents d7e3ecf4 02913a96
...@@ -225,7 +225,7 @@ gem 'addressable', '~> 2.3.8' ...@@ -225,7 +225,7 @@ gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0' gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.6.1' gem 'font-awesome-rails', '~> 4.6.1'
gem 'gemojione', '~> 3.0' gem 'gemojione', '~> 3.0'
gem 'gon', '~> 6.0.1' gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0' gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0' gem 'jquery-ui-rails', '~> 5.0.0'
......
...@@ -303,7 +303,7 @@ GEM ...@@ -303,7 +303,7 @@ GEM
gollum-rugged_adapter (0.4.2) gollum-rugged_adapter (0.4.2)
mime-types (>= 1.15) mime-types (>= 1.15)
rugged (~> 0.24.0, >= 0.21.3) rugged (~> 0.24.0, >= 0.21.3)
gon (6.0.1) gon (6.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
json json
multi_json multi_json
...@@ -575,7 +575,7 @@ GEM ...@@ -575,7 +575,7 @@ GEM
redis-store (~> 1.1.0) redis-store (~> 1.1.0)
redis-store (1.1.7) redis-store (1.1.7)
redis (>= 2.2) redis (>= 2.2)
request_store (1.3.0) request_store (1.3.1)
rerun (0.11.0) rerun (0.11.0)
listen (~> 3.0) listen (~> 3.0)
responders (2.1.1) responders (2.1.1)
...@@ -875,7 +875,7 @@ DEPENDENCIES ...@@ -875,7 +875,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 1.2.1) gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2) gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2) gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.0.1) gon (~> 6.1.0)
grape (~> 0.13.0) grape (~> 0.13.0)
grape-entity (~> 0.4.2) grape-entity (~> 0.4.2)
hamlit (~> 2.5) hamlit (~> 2.5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment