From 60bce0ef8e62de15bcf99fafb02eff0d3515dad1 Mon Sep 17 00:00:00 2001 From: Daniel Kehoe Date: Sun, 25 Aug 2013 15:45:00 -0700 Subject: [PATCH] bundle update --- Gemfile.lock | 103 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a191f86..39781e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,19 +14,19 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.14) + activesupport (= 3.2.14) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.5) arel (3.0.2) @@ -36,7 +36,7 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (2.3.2.0) + bootstrap-sass (2.3.2.1) sass (~> 3.2) builder (3.0.4) cancan (1.6.10) @@ -54,31 +54,30 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - cucumber (1.3.3) + cucumber (1.3.6) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) multi_json (~> 1.7.5) - multi_test (~> 0.0.1) - cucumber-rails (1.3.1) + multi_test (>= 0.0.2) + cucumber-rails (1.4.0) capybara (>= 1.1.2) cucumber (>= 1.2.0) nokogiri (>= 1.5.0) - rails (~> 3.0) + rails (>= 3.0.0) database_cleaner (1.0.1) debug_inspector (0.0.2) - devise (2.2.4) + devise (3.0.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) + railties (>= 3.2.6, < 5) + warden (~> 1.2.3) diff-lcs (1.2.4) - email_spec (1.4.0) + email_spec (1.5.0) launchy (~> 2.1) mail (~> 2.2) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.0.0) factory_girl (4.2.0) activesupport (>= 3.0.0) factory_girl_rails (4.2.1) @@ -87,10 +86,10 @@ GEM figaro (0.7.0) bundler (~> 1.0) rails (>= 3, < 5) - gherkin (2.12.0) + gherkin (2.12.1) multi_json (~> 1.3) hike (1.2.3) - i18n (0.6.1) + i18n (0.6.5) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -101,10 +100,10 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) + mime-types (1.24) mini_portile (0.5.1) - multi_json (1.7.7) - multi_test (0.0.1) + multi_json (1.7.9) + multi_test (0.0.2) nokogiri (1.6.0) mini_portile (~> 0.5.0) orm_adapter (0.4.0) @@ -118,17 +117,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.14) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -137,10 +136,10 @@ GEM rdoc (3.12.2) json (~> 1.4) rolify (3.2.0) - rspec-core (2.14.2) - rspec-expectations (2.14.0) + rspec-core (2.14.5) + rspec-expectations (2.14.2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.1) + rspec-mocks (2.14.3) rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) @@ -148,7 +147,7 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - sass (3.2.9) + sass (3.2.10) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -161,17 +160,17 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.7) + sqlite3 (1.3.8) thor (0.18.1) tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (2.1.1) + uglifier (2.2.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - warden (1.2.1) + warden (1.2.3) rack (>= 1.0) xpath (2.0.0) nokogiri (~> 1.3) @@ -187,7 +186,7 @@ DEPENDENCIES capybara coffee-rails (~> 3.2.1) cucumber-rails - database_cleaner + database_cleaner (= 1.0.1) devise email_spec factory_girl_rails @@ -195,7 +194,7 @@ DEPENDENCIES jquery-rails launchy quiet_assets - rails (= 3.2.13) + rails (= 3.2.14) rolify rspec-rails sass-rails (~> 3.2.3)