diff --git a/Gemfile.lock b/Gemfile.lock index 5c11915..ec28b6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,6 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.16) builder (3.1.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -35,6 +34,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (2.0.2) faraday (0.8.9) @@ -47,11 +47,12 @@ GEM multi_xml (~> 0.4) simple_oauth (~> 0.1) hike (1.2.3) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) - jquery-rails (3.1.0) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -60,13 +61,13 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.9.2) + multi_json (1.14.1) multi_xml (0.5.5) multipart-post (1.2.0) pg (0.17.1) polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) rails (4.0.3) actionmailer (= 4.0.3) @@ -86,7 +87,7 @@ GEM activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.2.2) + rake (13.0.0) rdoc (4.1.1) json (~> 1.4) sass (3.2.18) @@ -109,16 +110,15 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) - thor (0.19.1) - thread_safe (0.3.1) - atomic (>= 1.1.7, < 2) + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbolinks (2.2.1) coffee-rails - tzinfo (0.3.39) + tzinfo (0.3.56) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0)