diff --git a/Gemfile b/Gemfile index 40b7d0a4..d9a2befc 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ gem 'paper_trail', '~> 3.0.1' gem 'rails-observers' gem 'country_select', '~> 2.1.0' -gem 'gon', '~> 5.2.0' +gem 'gon', '~> 6.4.0' gem 'pusher' gem 'eventmachine', '~> 1.0.4' gem 'em-websocket', '~> 0.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index e83ec406..931974a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM eventmachine angularjs-rails (1.3.15) arel (4.0.2) - atomic (1.1.99) + atomic (1.1.101) awesome_print (1.2.0) axiom-types (0.1.0) descendants_tracker (~> 0.0.3) @@ -106,6 +106,7 @@ GEM execjs coffee-script-source (1.7.0) columnize (0.3.6) + concurrent-ruby (1.1.8) countries (0.9.3) currencies (~> 0.4.2) country_select (2.1.0) @@ -163,11 +164,11 @@ GEM globalize (4.0.0) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - gon (5.2.0) - actionpack (>= 2.3.0) - json + gon (6.4.0) + actionpack (>= 3.0.20) + i18n (>= 0.7) multi_json - request_store (>= 1.0.5) + request_store (>= 1.0) grape (0.7.0) activesupport builder @@ -190,7 +191,8 @@ GEM http_accept_language (2.0.1) http_parser.rb (0.6.0) httpclient (2.3.4.1) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) ice_nine (0.11.0) jbuilder (2.0.2) activesupport (>= 3.0.0) @@ -232,7 +234,7 @@ GEM metaclass (~> 0.0.1) momentjs-rails (2.5.1) railties (>= 3.1) - multi_json (1.10.1) + multi_json (1.15.0) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.21) @@ -319,7 +321,8 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.4) redis (>= 2.2) - request_store (1.1.0) + request_store (1.5.0) + rack (>= 1.4) rest-client (1.6.8) mime-types (~> 1.16) rdoc (>= 2.4.2) @@ -390,7 +393,7 @@ GEM faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) - tzinfo (0.3.42) + tzinfo (0.3.60) uglifier (2.4.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -447,7 +450,7 @@ DEPENDENCIES figaro font-awesome-sass globalize (~> 4.0.0) - gon (~> 5.2.0) + gon (~> 6.4.0) grape (~> 0.7.0) grape-entity (~> 0.4.2) grape-swagger (~> 0.7.2)