diff --git a/Gemfile.lock b/Gemfile.lock index dc37724..230a5f3 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.14) builder (3.1.4) coffee-rails (4.0.0) coffee-script (>= 2.2.0) @@ -35,14 +34,16 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.6) erubis (2.7.0) execjs (2.0.1) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.5.1) activesupport (>= 3.0.0) multi_json (>= 1.2.0) - jquery-rails (3.0.4) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) @@ -51,10 +52,10 @@ GEM treetop (~> 1.4.8) mime-types (1.25) minitest (4.7.5) - multi_json (1.8.0) + multi_json (1.14.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) actionmailer (= 4.0.0) @@ -91,16 +92,15 @@ GEM sprockets (~> 2.8) sqlite3 (1.3.8) sqlite3 (1.3.8-x86-mingw32) - thor (0.18.1) - thread_safe (0.1.3) - atomic + thor (1.0.1) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbolinks (1.3.0) coffee-rails - tzinfo (0.3.37) + tzinfo (0.3.56) uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)