diff --git a/Gemfile.lock b/Gemfile.lock index 9157959..97ff664 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,6 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.0) - atomic (1.1.13) bcrypt-ruby (3.1.2) bootstrap-sass (2.3.2.2) sass (~> 3.2) @@ -52,6 +51,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.2.2) daemons (1.1.9) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) @@ -81,11 +81,12 @@ GEM has_scope (0.5.1) highline (1.6.19) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) - jquery-rails (3.0.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.4) @@ -106,7 +107,7 @@ GEM minitest (4.7.5) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.8.0) + multi_json (1.15.0) mysql2 (0.3.13) nested_form (0.3.2) net-scp (1.1.2) @@ -128,11 +129,11 @@ GEM slop (~> 3.4) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.5.2) + rack (1.5.5) rack-pjax (0.7.0) nokogiri (~> 1.5) rack (~> 1.3) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.0.0) actionmailer (= 4.0.0) @@ -163,7 +164,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.12.0) - rake (10.1.0) + rake (13.0.6) ref (1.0.5) remotipart (1.2.1) responders (0.6.5) @@ -188,16 +189,15 @@ GEM therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thor (0.18.1) - thread_safe (0.1.2) - atomic + thor (1.2.2) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) typhoeus (0.6.5) ethon (~> 0.6.1) - tzinfo (0.3.37) + tzinfo (0.3.62) uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)