diff --git a/Gemfile.lock b/Gemfile.lock index 22667591..dfe64343 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.17) + aasm (3.0.19) actionmailer (3.2.13) actionpack (= 3.2.13) mail (~> 2.5.3) @@ -33,11 +33,11 @@ GEM acts_as_list (0.2.0) activerecord (>= 3.0) arel (3.0.2) - aruba (0.5.2) - childprocess (~> 0.3.6) + aruba (0.5.3) + childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) - atomic (1.1.8) + atomic (1.1.9) bcrypt-ruby (3.0.1) builder (3.0.4) bullet (4.6.0) @@ -60,7 +60,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) - cucumber (1.3.1) + cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) @@ -70,7 +70,7 @@ GEM cucumber (>= 1.2.0) nokogiri (>= 1.5.0) rails (~> 3.0) - database_cleaner (0.9.1) + database_cleaner (1.0.1) diff-lcs (1.2.4) erubis (2.7.0) execjs (1.4.0) @@ -80,29 +80,28 @@ GEM factory_girl_rails (4.2.1) factory_girl (~> 4.2.0) railties (>= 3.0.0) - ffi (1.8.1) + ffi (1.9.0) gherkin (2.12.0) multi_json (~> 1.3) - hike (1.2.2) + hike (1.2.3) htmlentities (4.3.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (3.0.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.0) libv8 (3.11.8.17) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) mime-types (1.23) - mocha (0.13.3) + mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.7.2) + multi_json (1.7.6) mysql2 (0.3.11) - nokogiri (1.5.9) + nokogiri (1.5.10) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) @@ -121,8 +120,8 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) - rails_autolink (1.0.9) - rails (~> 3.1) + rails_autolink (1.1.0) + rails (> 3.1) railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -133,19 +132,19 @@ GEM rake (10.0.4) rdoc (3.12.2) json (~> 1.4) - ref (1.0.4) + ref (1.0.5) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rubyzip (0.9.9) - safe_yaml (0.9.1) + safe_yaml (0.9.3) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.8) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.32.1) + selenium-webdriver (2.33.0) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip @@ -169,16 +168,16 @@ GEM thor (0.18.1) thread_safe (0.1.0) atomic - tilt (1.3.7) + tilt (1.4.1) timecop (0.6.1) tolk (1.3.9) safe_yaml (~> 0.8) will_paginate - treetop (1.4.12) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (2.0.1) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) uniform_notifier (1.2.0)