Updated to rails 3.2.1

12 years ago · c61199b4c9
parent 5d6ba15b19
commit c61199b4c9
4 changed files with 79 additions and 72 deletions
--- a/4
+++ b/4
@ -9,8 +9,8 @@ gem 'carrierwave'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails'
+  gem 'coffee-rails'
  gem 'uglifier', '>= 1.0.3'
 end

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,35 +1,34 @@
 GEM
  remote: http://rubygems.org/
  specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
      builder (~> 3.0.0)
      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
      multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.0)
    awesome_print (0.4.0)
    builder (3.0.0)
    capybara (1.1.2)
@ -43,21 +42,21 @@ GEM
      activesupport (~> 3.0)
    childprocess (0.3.0)
      ffi (~> 1.0.6)
-    coffee-rails (3.1.1)
+    coffee-rails (3.2.2)
      coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
    coffee-script (2.2.0)
      coffee-script-source
      execjs
-    coffee-script-source (1.1.3)
+    coffee-script-source (1.2.0)
    diff-lcs (1.1.3)
    erubis (2.7.0)
-    execjs (1.2.9)
+    execjs (1.3.0)
      multi_json (~> 1.0)
-    factory_girl (2.3.0)
-      activesupport
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.6.0)
+      factory_girl (~> 2.5.0)
      railties (>= 3.0.0)
    ffi (1.0.11)
    guard (1.0.0)
@ -80,75 +79,73 @@ GEM
      multi_json
      rainbow
      sprockets (~> 2)
-    jquery-rails (1.0.18)
-      railties (~> 3.0)
+    journey (1.0.1)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0.beta, < 5.0)
      thor (~> 0.14)
-    json (1.6.1)
+    json (1.6.5)
    json_pure (1.6.5)
    libnotify (0.7.2)
-    mail (2.3.0)
+    mail (2.4.1)
      i18n (>= 0.4.0)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    mime-types (1.17.2)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
    mysql2 (0.3.10)
    nokogiri (1.5.0)
    polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.1)
    rack-cache (1.1)
      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
    rack-ssl (1.3.2)
      rack
    rack-test (0.6.1)
      rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
      bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
      rack-ssl (~> 1.3.2)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (~> 0.14.6)
    rainbow (1.1.3)
    rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
      json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
    rubyzip (0.9.5)
-    sass (3.1.10)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
+    sass (3.1.15)
+    sass-rails (3.2.4)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
    selenium-webdriver (2.13.0)
      childprocess (>= 0.2.1)
      ffi (~> 1.0.9)
      json_pure
      rubyzip
-    sprockets (2.0.3)
+    sprockets (2.1.2)
      hike (~> 1.2)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
@ -171,7 +168,7 @@ DEPENDENCIES
  awesome_print
  capybara
  carrierwave
-  coffee-rails (~> 3.1.1)
+  coffee-rails
  factory_girl_rails
  guard
  guard-jasmine-headless-webkit
@ -182,6 +179,6 @@ DEPENDENCIES
  mysql2
  rails
  rspec-rails
-  sass-rails (~> 3.1.5)
+  sass-rails
  tzinfo
  uglifier (>= 1.0.3)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@ -27,4 +27,11 @@ AsciiIo::Application.configure do

  # Expands the lines which load the assets
  config.assets.debug = true
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
 end
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@ -36,4 +36,7 @@ AsciiIo::Application.configure do

  # Print deprecation notices to the stderr
  config.active_support.deprecation = :stderr
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 end