diff --git a/Gemfile b/Gemfile index 196442e..3a7c7a4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby "2.5.8" -gem 'rails', '3.2.16' +gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 27182a6..a6b08a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.16) - actionpack (= 3.2.16) + actionmailer (3.2.17) + actionpack (= 3.2.17) mail (~> 2.5.4) - actionpack (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,18 +14,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.16) - activesupport (= 3.2.16) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - activesupport (3.2.16) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.2) @@ -50,6 +50,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) + concurrent-ruby (1.1.8) diff-lcs (1.1.3) easymarklet (0.0.8) easyxdm-rails (~> 0.0.5) @@ -71,7 +72,8 @@ GEM rake hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) @@ -79,11 +81,11 @@ GEM json (1.8.6) libwebsocket (0.1.5) addressable - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.8.2) + multi_json (1.15.0) nokogiri (1.5.5) pg (0.21.0) poltergeist (1.0.2) @@ -92,30 +94,30 @@ GEM faye-websocket (~> 0.4, >= 0.4.4) http_parser.rb (~> 0.5.3) multi_json (~> 1.0) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.12.1) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.16) - actionmailer (= 3.2.16) - actionpack (= 3.2.16) - activerecord (= 3.2.16) - activeresource (= 3.2.16) - activesupport (= 3.2.16) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.16) - railties (3.2.16) - actionpack (= 3.2.16) - activesupport (= 3.2.16) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (13.0.3) rdoc (3.12.2) json (~> 1.4) rspec-core (2.12.0) @@ -140,17 +142,17 @@ GEM libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.18.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) + tzinfo (0.3.60) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -170,7 +172,7 @@ DEPENDENCIES jquery-rails pg (< 1) poltergeist - rails (= 3.2.16) + rails (= 3.2.17) rspec-rails (~> 2.0) sass-rails (~> 3.2.3) uglifier (>= 1.0.3)