diff --git a/Gemfile.lock b/Gemfile.lock index 66dfdbd..9b7a973 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,6 @@ GEM tzinfo (~> 0.3.37) addressable (2.3.5) arel (4.0.0) - atomic (1.1.10) authem (1.1.0) activesupport (~> 4.0.0.rc1) bcrypt-ruby @@ -52,6 +51,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) + concurrent-ruby (1.1.5) cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -89,10 +89,11 @@ GEM railties (>= 3.1, < 4.1) hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.0.2) activesupport (>= 3.0.0) - jquery-rails (3.0.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) launchy (2.3.0) @@ -104,7 +105,7 @@ GEM mime-types (1.23) mini_portile (0.5.0) minitest (4.7.5) - multi_json (1.7.7) + multi_json (1.14.1) nokogiri (1.6.0) mini_portile (~> 0.5.0) pg (0.15.1) @@ -119,8 +120,8 @@ GEM slop (~> 3.4) pry-rails (0.3.2) pry (>= 0.9.10) - 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) @@ -135,7 +136,7 @@ GEM activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (12.3.3) redcarpet (2.3.0) rspec-core (2.13.1) rspec-expectations (2.13.0) @@ -163,14 +164,13 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - thor (0.18.1) - thread_safe (0.1.0) - atomic + thor (1.0.1) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.14) polyglot polyglot (>= 0.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)