diff --git a/Gemfile.lock b/Gemfile.lock index 50b87f7e9..72698a392 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM multi_xml (~> 0.2.0) rest-client (~> 1.6.1) arel (3.0.2) - builder (3.0.3) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -41,34 +41,36 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.2.3) daemons (1.1.9) erubis (2.7.0) eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.5) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) libv8 (3.3.10.4) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.15.0) multi_xml (0.2.2) pg (0.14.1) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.15.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.8) actionmailer (= 3.2.8) @@ -87,8 +89,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) + rake (13.1.0) + rdoc (3.12.2) json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) @@ -97,7 +99,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) @@ -108,8 +110,8 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) - tilt (1.3.3) + thor (1.3.0) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)