diff --git a/Gemfile.lock b/Gemfile.lock index 5bd968a..b3b76a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,7 @@ GEM addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -40,6 +40,7 @@ GEM execjs coffee-script-source (1.3.3) commonjs (0.2.6) + concurrent-ruby (1.1.5) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -73,13 +74,14 @@ GEM activesupport (~> 3.0) haml (~> 3.0) railties (~> 3.0) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.4) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) less (2.2.1) commonjs (~> 0.2.6) less-rails (2.2.3) @@ -95,18 +97,18 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.14.0) orm_adapter (0.4.0) pg (0.14.0) polyglot (0.3.3) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.7) actionmailer (= 3.2.7) @@ -123,13 +125,13 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) + rake (13.0.0) rb-fchange (0.0.5) ffi rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) rspec (2.11.0) rspec-core (~> 2.11.0) @@ -157,15 +159,15 @@ GEM spork-rails (3.2.0) rails (>= 3.0.0, < 3.3.0) spork (>= 1.0rc0) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) therubyracer (0.10.1) libv8 (~> 3.3.10) - thor (0.15.4) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)