diff --git a/Gemfile.lock b/Gemfile.lock index af4ae4c..8f66465 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) 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) @@ -39,6 +39,7 @@ GEM execjs coffee-script-source (1.3.1) commonjs (0.2.6) + concurrent-ruby (1.1.6) daemons (1.1.8) database_cleaner (0.9.1) devise (2.1.2) @@ -60,17 +61,18 @@ GEM multipart-post (~> 1.1) haml (3.1.4) hashie (1.2.0) - hike (1.2.1) + hike (1.2.3) httparty (0.8.1) multi_json multi_xml httpauth (0.1) - i18n (0.6.0) - journey (1.0.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.1) + json (2.3.1) less (2.2.1) commonjs (~> 0.2.6) less-rails (2.2.3) @@ -92,7 +94,7 @@ GEM rake rspec (>= 2.9) moped (1.2.5) - multi_json (1.3.4) + multi_json (1.15.0) multi_xml (0.4.2) multipart-post (1.1.5) oauth2 (0.6.1) @@ -112,12 +114,12 @@ GEM orm_adapter (0.4.0) pg (0.13.2) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.12.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.3) actionmailer (= 3.2.3) @@ -134,9 +136,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rake (13.0.1) + rdoc (3.9.5) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -155,7 +156,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -166,7 +167,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)