diff --git a/sample_app/Gemfile b/sample_app/Gemfile index 7f667363..d3a241b3 100644 --- a/sample_app/Gemfile +++ b/sample_app/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.13' +gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/sample_app/Gemfile.lock b/sample_app/Gemfile.lock index 54b6f2ba..44557582 100644 --- a/sample_app/Gemfile.lock +++ b/sample_app/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.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,25 +14,26 @@ 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.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) 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.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.3.5) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) ar-octopus (0.6.0) activerecord (>= 3.0.0, < 4.0) activesupport (>= 3.0.0, < 4.0) - arel (3.0.2) + arel (3.0.3) aruba (0.5.3) childprocess (>= 0.3.6) cucumber (>= 1.1.1) @@ -47,6 +48,7 @@ GEM childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) coderay (1.0.9) + concurrent-ruby (1.2.3) cucumber (1.3.3) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -61,54 +63,58 @@ GEM database_cleaner (1.0.1) diff-lcs (1.2.4) erubis (2.7.0) - ffi (1.9.0) + ffi (1.16.3) gherkin (2.12.0) multi_json (~> 1.3) hike (1.2.3) - i18n (0.6.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - json (1.8.0) + json (1.8.6) launchy (2.3.0) addressable (~> 2.3) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) - mime-types (1.23) - mini_portile (0.5.1) - multi_json (1.7.7) + mime-types (1.25.1) + mini_portile2 (2.8.6) + multi_json (1.7.9) multi_test (0.0.1) - nokogiri (1.6.0) - mini_portile (~> 0.5.0) + nokogiri (1.16.5) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) pg (0.15.1) - polyglot (0.3.3) + polyglot (0.3.5) pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - rack (1.4.5) - rack-cache (1.2) + public_suffix (5.0.5) + racc (1.7.3) + rack (1.4.7) + rack-cache (1.17.0) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) 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.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (13.2.1) rdoc (3.12.2) json (~> 1.4) rspec-core (2.14.0) @@ -123,18 +129,18 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) slop (3.4.5) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) - thor (0.18.1) + thor (1.3.1) tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.62) xpath (2.0.0) nokogiri (~> 1.3) @@ -150,6 +156,6 @@ DEPENDENCIES launchy pg pry - rails (= 3.2.13) + rails (= 3.2.17) rspec-rails sqlite3