diff --git a/Gemfile.lock b/Gemfile.lock index dfc1162..20bc95f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,6 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.0) - atomic (1.1.9) better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -50,6 +49,7 @@ GEM execjs coffee-script-source (1.6.2) commonjs (0.2.6) + concurrent-ruby (1.1.5) debug_inspector (0.0.2) diff-lcs (1.2.4) dotenv (0.7.0) @@ -63,10 +63,11 @@ GEM ffi (1.8.1) hashie (2.0.5) hike (1.2.2) - i18n (0.6.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.0.2) activesupport (>= 3.0.0) - jquery-rails (2.2.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) @@ -84,8 +85,8 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - minitest (4.7.4) - multi_json (1.7.4) + minitest (4.7.5) + multi_json (1.14.1) multipart-post (1.2.0) nokogiri (1.5.9) oauth (0.4.7) @@ -100,8 +101,8 @@ GEM omniauth-oauth (~> 1.0) pg (0.15.1) polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) rails (4.0.0.rc1) actionmailer (= 4.0.0.rc1) @@ -117,7 +118,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.11.0) - rake (10.0.4) + rake (12.3.3) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) @@ -163,9 +164,8 @@ GEM therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref - thor (0.18.1) - thread_safe (0.1.0) - atomic + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.12) polyglot @@ -176,7 +176,7 @@ GEM actionpack (>= 3.1) execjs railties (>= 3.1) - tzinfo (0.3.37) + tzinfo (0.3.56) uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)