From b93a918337e99c3fe3ad059f093b1ee56b9e6a7d Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 28 Jul 2011 11:56:08 +0300
Subject: MassAssignmentProtection: consider 'id' insensetive in
 StrictSanitizer

In order to use StrictSanitizer in test mode
Consider :id as not sensetive attribute that can be filtered from
mass assignement without exception.
---
 .../generators/rails/app/templates/config/environments/test.rb.tt    | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index ee068b0202..80198cc21e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -34,6 +34,11 @@
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
+  <%- unless options.skip_active_record? -%>
+  # Raise exception on mass assignment protection for ActiveRecord models
+  config.active_record.mass_assignment_sanitizer = :strict
+  <%- end -%>
+
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end
-- 
cgit v1.2.3


From 5515a18aa52df3f71ed4d29fbcc0dc2819e39d5e Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 17:25:32 -0400
Subject: Expanded meta-data in gemspec to include author, email, etc.;
 Defaults include "TODO" to prevent gems from being built without review.

---
 .../generators/rails/plugin_new/templates/%name%.gemspec     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index eb1a1e5054..b469edd772 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -1,12 +1,16 @@
 # Provide a simple gemspec so you can easily use your
 # project in your rails apps through git.
 Gem::Specification.new do |s|
-  s.name = "<%= name %>"
-  s.summary = "Insert <%= camelized %> summary."
-  s.description = "Insert <%= camelized %> description."
+  s.name        = "<%= name %>"
+  s.version     = "0.0.1"
+  s.authors     = ["TODO: Your name"]
+  s.email       = ["TODO: Your email"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of <%= camelized %>."
+  s.description = "TODO: Description of <%= camelized %>."
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
-  s.version = "0.0.1"
 end
-- 
cgit v1.2.3


From d9b59c341c5cc5848a42e936588a67130bf7ff4a Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 18:51:44 -0400
Subject: Extracted version from gemspec and placed it in its own file. This is
 consistent with the approach taken by "bundle gem", and is expected by gems
 such as svenfuchs/gem-release which can be used to bump / tag versions of
 gems.

---
 .../rails/generators/rails/plugin_new/plugin_new_generator.rb  |  1 +
 .../rails/generators/rails/plugin_new/templates/%name%.gemspec | 10 +++++++---
 .../rails/plugin_new/templates/lib/%name%/version.rb           |  3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 7c0a2b9cf4..56b1587760 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -46,6 +46,7 @@ module Rails
     def lib
       template "lib/%name%.rb"
       template "lib/tasks/%name%_tasks.rake"
+      template "lib/%name%/version.rb"
       if full?
         template "lib/%name%/engine.rb"
       end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index b469edd772..736d114901 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -1,8 +1,12 @@
-# Provide a simple gemspec so you can easily use your
-# project in your rails apps through git.
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "<%= name %>/version"
+
+# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "<%= name %>"
-  s.version     = "0.0.1"
+  s.version     = <%= camelized %>::VERSION
   s.authors     = ["TODO: Your name"]
   s.email       = ["TODO: Your email"]
   s.homepage    = "TODO"
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
new file mode 100644
index 0000000000..ef07ef2e19
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
@@ -0,0 +1,3 @@
+module <%= camelized %>
+  VERSION = "0.0.1"
+end
-- 
cgit v1.2.3


From a74e4736f95befa7a22c208019bf11a155ff7543 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 21:54:45 -0400
Subject: Moved dependencies from Gemfile to gemspec to eliminate redundant
 declarations.

---
 .../rails/plugin_new/templates/%name%.gemspec        | 11 +++++++++++
 .../generators/rails/plugin_new/templates/Gemfile    | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index 736d114901..b8d68ad0bc 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -17,4 +17,15 @@ Gem::Specification.new do |s|
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
+
+  # If your gem is dependent on a specific version (or higher) of Rails:
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
+
+<% unless options[:skip_javascript] || !full? -%>
+  # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+  # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
+
+<% end -%>
+  # Declare development-specific dependencies:
+  s.add_development_dependency "<%= gem_for_database %>"
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 7e6eb18341..160baa6906 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,14 +1,20 @@
 source "http://rubygems.org"
 
-<%= rails_gemfile_entry -%>
+# Declare your gem's dependencies in <%= name %>.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
 
-<% if full? -%>
-<%= database_gemfile_entry -%>
-<% end -%>
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
 
-<% if mountable? -%>
-<%= javascript_gemfile_entry -%>
-<% end -%>
+<% if options.dev? || options.edge? -%>
+# Your gem is dependent on dev or edge Rails. Once you can lock this
+# dependency down to a specific version, move it to your gemspec.
+<%= rails_gemfile_entry -%>
 
+<% end -%>
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
\ No newline at end of file
-- 
cgit v1.2.3


From d10f268d2057a4e9d46bd003afeceb4e910d1153 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 28 Jul 2011 11:48:21 -0300
Subject: Tidy up a bit plugin new gemspec

---
 .../rails/generators/rails/plugin_new/templates/%name%.gemspec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index b8d68ad0bc..8588e88077 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -18,14 +18,10 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 <% end -%>
 
-  # If your gem is dependent on a specific version (or higher) of Rails:
-  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
-
-<% unless options[:skip_javascript] || !full? -%>
-  # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails::VERSION::STRING %>"
+<% if full? && !options[:skip_javascript] -%>
   # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
-
 <% end -%>
-  # Declare development-specific dependencies:
+
   s.add_development_dependency "<%= gem_for_database %>"
 end
-- 
cgit v1.2.3


From 54463592cbfd78e1eb03bc1ac90e044dd30900a0 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 28 Jul 2011 16:46:39 -0300
Subject: Tidy up

---
 railties/lib/rails/generators/app_base.rb                 | 6 ++++--
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index bbdd000ad9..21a2ae4e28 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -200,9 +200,11 @@ module Rails
 
       def assets_gemfile_entry
         <<-GEMFILE.strip_heredoc
+          # Gems used only for assets and not required
+          # in production environments by default.
           group :assets do
-            gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails'
-            gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails'
+            gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
+            gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
             gem 'uglifier'
           end
         GEMFILE
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 88eea40b1b..c83e7ddf80 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -7,10 +7,7 @@ source 'http://rubygems.org'
 <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
 <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
 
-# Gems used only for assets and not required
-# in production environments by default.
 <%= assets_gemfile_entry %>
-
 <%= javascript_gemfile_entry %>
 
 # Use unicorn as the web server
-- 
cgit v1.2.3


From d8e62a93e388c674aa95b32b8688ba6e8366a643 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 15:41:08 -0400
Subject: Include empty app/mailers directory in mountable and full plugins

---
 railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb   | 1 +
 .../generators/rails/plugin_new/templates/app/mailers/.empty_directory   | 0
 2 files changed, 1 insertion(+)
 create mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 56b1587760..c46422437d 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -19,6 +19,7 @@ module Rails
         empty_directory_with_gitkeep "app/controllers"
         empty_directory_with_gitkeep "app/views"
         empty_directory_with_gitkeep "app/helpers"
+        empty_directory_with_gitkeep "app/mailers"
         empty_directory_with_gitkeep "app/assets/images/#{name}"
       end
     end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory b/railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 040f65b0913793bd6f2f03500e6e6a50b83f3e56 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 31 Jul 2011 21:39:10 +0530
Subject: fixes #2368. rake about not showing the middleware, db adapter and db
 schema version

---
 railties/lib/rails/tasks/misc.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 833fcb6f72..8b4775d1d3 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -14,7 +14,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about do
+task :about => :environment do
   puts Rails::Info
 end
 
-- 
cgit v1.2.3


From 6dda2167154c856e8776a192e90118c3b3129b78 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 1 Aug 2011 12:32:17 -0700
Subject: Merge pull request #2324 from zenapsis/3-1-stable

Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
---
 railties/lib/rails/engine.rb | 6 +++---
 railties/lib/rails/paths.rb  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index c41f7d7c2e..2c3f61f404 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -542,9 +542,9 @@ module Rails
     end
 
     initializer :append_assets_path do |app|
-      app.config.assets.paths.unshift(*paths["vendor/assets"].existent)
-      app.config.assets.paths.unshift(*paths["lib/assets"].existent)
-      app.config.assets.paths.unshift(*paths["app/assets"].existent)
+      app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
+      app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
+      app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
     end
 
     initializer :prepend_helpers_path do |app|
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index de3d0b6fc5..55b820b12e 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -171,6 +171,10 @@ module Rails
       def existent
         expanded.select { |f| File.exists?(f) }
       end
+      
+      def existent_directories
+        expanded.select {|d| Dir.exists?(d) }
+      end
 
       alias to_a expanded
     end
-- 
cgit v1.2.3


From 3a4dc9d34c1cde8bf34dfa4b4600fb8bcef9eb45 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 1 Aug 2011 17:29:03 -0700
Subject: use File.directory? as Dir.exists? is only 1.9.2+

---
 railties/lib/rails/paths.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 55b820b12e..b37421c09c 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -171,9 +171,9 @@ module Rails
       def existent
         expanded.select { |f| File.exists?(f) }
       end
-      
+
       def existent_directories
-        expanded.select {|d| Dir.exists?(d) }
+        expanded.select { |d| File.directory?(d) }
       end
 
       alias to_a expanded
-- 
cgit v1.2.3


From bf5d1d46623d478bb4371a60bead97022cef11ed Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 3 Aug 2011 19:18:34 -0300
Subject: Don't require assets group in production by default, you can change
 this default in the application.rb anyways

---
 .../rails/generators/rails/app/templates/config/application.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 7687b1beac..dd0cf64650 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -13,9 +13,13 @@ require "active_resource/railtie"
 <% end -%>
 
 # If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+# current environment and also include :assets gems if you ...
+if defined?(Bundler)
+  # ... precompile your assets
+  Bundler.require *Rails.groups(:assets => %w(development test))
+  # ... want your assets to be lazily compiled also in production
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module <%= app_const_base %>
   class Application < Rails::Application
-- 
cgit v1.2.3


From 7d4321711ebb99d2669c02b2030ade0de69655af Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 3 Aug 2011 21:04:32 -0300
Subject: Fix a bit precompile and lazy compile comments

---
 .../lib/rails/generators/rails/app/templates/config/application.rb  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index dd0cf64650..86c9bd2d1d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -12,12 +12,10 @@ require "active_resource/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
 
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if you ...
 if defined?(Bundler)
-  # ... precompile your assets
+  # If you precompile assets before deploying to production, use this line
   Bundler.require *Rails.groups(:assets => %w(development test))
-  # ... want your assets to be lazily compiled also in production
+  # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-- 
cgit v1.2.3


From 201e41e11aa0380265d09f763a4e6ef10868e6e7 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 5 Aug 2011 21:28:14 -0300
Subject: Avoid generating app/views/layouts/application.html.erb on mountable
 engines, just generate the namespaced one

---
 .../generators/rails/plugin_new/plugin_new_generator.rb    |  2 --
 .../app/views/layouts/%name%/application.html.erb.tt       | 14 ++++++++++++++
 .../templates/app/views/layouts/application.html.erb.tt    | 14 --------------
 3 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
 delete mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index c46422437d..4baa2110e7 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -11,8 +11,6 @@ module Rails
     def app
       if mountable?
         directory "app"
-        template "app/views/layouts/application.html.erb.tt",
-                 "app/views/layouts/#{name}/application.html.erb"
         empty_directory_with_gitkeep "app/assets/images/#{name}"
       elsif full?
         empty_directory_with_gitkeep "app/models"
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
new file mode 100644
index 0000000000..01550dec2f
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= camelized %></title>
+  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= javascript_include_tag "<%= name %>/application" %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+
+<%%= yield %>
+
+</body>
+</html>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
deleted file mode 100644
index 01550dec2f..0000000000
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application" %>
-  <%%= javascript_include_tag "<%= name %>/application" %>
-  <%%= csrf_meta_tags %>
-</head>
-<body>
-
-<%%= yield %>
-
-</body>
-</html>
-- 
cgit v1.2.3


From 8845ae683e2688bc619baade49510c17e978518f Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 7 Aug 2011 12:34:49 -0300
Subject: x_sendfile_header now defaults to nil and production.rb env file
 doesn't set a particular value for it. This allows servers to set it through
 X-Sendfile-Type, read
 https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info.
 Anyways you can force this value in your production.rb

---
 railties/lib/rails/application.rb                                     | 4 +---
 .../rails/app/templates/config/environments/production.rb.tt          | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index fb60ddd9b5..9e2f1a4b7a 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -163,9 +163,7 @@ module Rails
         middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
-        if config.action_dispatch.x_sendfile_header.present?
-          middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
-        end
+        middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
         middleware.use ::ActionDispatch::Reloader unless config.cache_classes
         middleware.use ::ActionDispatch::Callbacks
         middleware.use ::ActionDispatch::Cookies
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 06ed890e05..de56d47688 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -15,8 +15,8 @@
   config.assets.compress = true
 
   # Specifies the header that your server uses for sending files
-  # (comment out if your front-end server doesn't support this)
-  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
-- 
cgit v1.2.3


From 8360d7196515ba66fe5d535f6dbeeea5394e966a Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 8 Aug 2011 12:49:10 -0300
Subject: Initialize config.assets.version the same way it's done in Sprockets

---
 railties/lib/rails/application/configuration.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 975e159999..cd850b6a75 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -37,6 +37,7 @@ module Rails
         @assets.paths      = []
         @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
         @assets.prefix     = "/assets"
+        @assets.version    = ''
 
         @assets.cache_store    = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor  = nil
-- 
cgit v1.2.3


From 396e12155aacdb4904fa13e3dc617b6554f48c5f Mon Sep 17 00:00:00 2001
From: Pivotal Casebook <casebook-dev@googlegroups.com>
Date: Mon, 8 Aug 2011 13:47:24 -0300
Subject: Further monkey-patching to avoid deprecation warnings

---
 railties/lib/rails/tasks/documentation.rake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 5d613e0698..ca8875ad9b 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -8,6 +8,8 @@ end
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
 class RDocTaskWithoutDescriptions < RDoc::Task
+  include ::Rake::DSL
+
   def define
     task rdoc_task_name
 
-- 
cgit v1.2.3


From 19ac034bdc9be175eff7cf54208ba14b43d97681 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 25 Jul 2011 18:54:25 -0300
Subject: Don't use Rack::Sendfile middleware if x_sendfile_header is not
 present

---
 railties/lib/rails/application.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 9e2f1a4b7a..fb60ddd9b5 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -163,7 +163,9 @@ module Rails
         middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
-        middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
+        if config.action_dispatch.x_sendfile_header.present?
+          middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
+        end
         middleware.use ::ActionDispatch::Reloader unless config.cache_classes
         middleware.use ::ActionDispatch::Callbacks
         middleware.use ::ActionDispatch::Cookies
-- 
cgit v1.2.3


From b82e226b7fb2e4dd443a4016f586ce06516d3d85 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 17:25:32 -0400
Subject: Expanded meta-data in gemspec to include author, email, etc.;
 Defaults include "TODO" to prevent gems from being built without review.

---
 .../generators/rails/plugin_new/templates/%name%.gemspec     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index eb1a1e5054..b469edd772 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -1,12 +1,16 @@
 # Provide a simple gemspec so you can easily use your
 # project in your rails apps through git.
 Gem::Specification.new do |s|
-  s.name = "<%= name %>"
-  s.summary = "Insert <%= camelized %> summary."
-  s.description = "Insert <%= camelized %> description."
+  s.name        = "<%= name %>"
+  s.version     = "0.0.1"
+  s.authors     = ["TODO: Your name"]
+  s.email       = ["TODO: Your email"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of <%= camelized %>."
+  s.description = "TODO: Description of <%= camelized %>."
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
-  s.version = "0.0.1"
 end
-- 
cgit v1.2.3


From f9eadb8b432f220865c5205a81e6dd5af90f35b5 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 18:51:44 -0400
Subject: Extracted version from gemspec and placed it in its own file. This is
 consistent with the approach taken by "bundle gem", and is expected by gems
 such as svenfuchs/gem-release which can be used to bump / tag versions of
 gems.

---
 .../rails/generators/rails/plugin_new/plugin_new_generator.rb  |  1 +
 .../rails/generators/rails/plugin_new/templates/%name%.gemspec | 10 +++++++---
 .../rails/plugin_new/templates/lib/%name%/version.rb           |  3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 7c0a2b9cf4..56b1587760 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -46,6 +46,7 @@ module Rails
     def lib
       template "lib/%name%.rb"
       template "lib/tasks/%name%_tasks.rake"
+      template "lib/%name%/version.rb"
       if full?
         template "lib/%name%/engine.rb"
       end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index b469edd772..736d114901 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -1,8 +1,12 @@
-# Provide a simple gemspec so you can easily use your
-# project in your rails apps through git.
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "<%= name %>/version"
+
+# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "<%= name %>"
-  s.version     = "0.0.1"
+  s.version     = <%= camelized %>::VERSION
   s.authors     = ["TODO: Your name"]
   s.email       = ["TODO: Your email"]
   s.homepage    = "TODO"
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
new file mode 100644
index 0000000000..ef07ef2e19
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
@@ -0,0 +1,3 @@
+module <%= camelized %>
+  VERSION = "0.0.1"
+end
-- 
cgit v1.2.3


From 47cc214600b9f099140a1df34bc68432ad1d2b23 Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 21:54:45 -0400
Subject: Moved dependencies from Gemfile to gemspec to eliminate redundant
 declarations.

---
 .../rails/plugin_new/templates/%name%.gemspec        | 11 +++++++++++
 .../generators/rails/plugin_new/templates/Gemfile    | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index 736d114901..b8d68ad0bc 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -17,4 +17,15 @@ Gem::Specification.new do |s|
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
+
+  # If your gem is dependent on a specific version (or higher) of Rails:
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
+
+<% unless options[:skip_javascript] || !full? -%>
+  # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+  # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
+
+<% end -%>
+  # Declare development-specific dependencies:
+  s.add_development_dependency "<%= gem_for_database %>"
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 7e6eb18341..160baa6906 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,14 +1,20 @@
 source "http://rubygems.org"
 
-<%= rails_gemfile_entry -%>
+# Declare your gem's dependencies in <%= name %>.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
 
-<% if full? -%>
-<%= database_gemfile_entry -%>
-<% end -%>
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
 
-<% if mountable? -%>
-<%= javascript_gemfile_entry -%>
-<% end -%>
+<% if options.dev? || options.edge? -%>
+# Your gem is dependent on dev or edge Rails. Once you can lock this
+# dependency down to a specific version, move it to your gemspec.
+<%= rails_gemfile_entry -%>
 
+<% end -%>
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
\ No newline at end of file
-- 
cgit v1.2.3


From 60f593dc548e5a62cd1a6de7512eaf344beff788 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 28 Jul 2011 11:48:21 -0300
Subject: Tidy up a bit plugin new gemspec

---
 .../rails/generators/rails/plugin_new/templates/%name%.gemspec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index b8d68ad0bc..8588e88077 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -18,14 +18,10 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 <% end -%>
 
-  # If your gem is dependent on a specific version (or higher) of Rails:
-  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
-
-<% unless options[:skip_javascript] || !full? -%>
-  # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails::VERSION::STRING %>"
+<% if full? && !options[:skip_javascript] -%>
   # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
-
 <% end -%>
-  # Declare development-specific dependencies:
+
   s.add_development_dependency "<%= gem_for_database %>"
 end
-- 
cgit v1.2.3


From 651a9c93be23651bf33b53813f1124aa69ae53de Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 28 Jul 2011 16:46:39 -0300
Subject: Tidy up

---
 railties/lib/rails/generators/app_base.rb                 | 6 ++++--
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index bbdd000ad9..21a2ae4e28 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -200,9 +200,11 @@ module Rails
 
       def assets_gemfile_entry
         <<-GEMFILE.strip_heredoc
+          # Gems used only for assets and not required
+          # in production environments by default.
           group :assets do
-            gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails'
-            gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails'
+            gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
+            gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
             gem 'uglifier'
           end
         GEMFILE
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 88eea40b1b..c83e7ddf80 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -7,10 +7,7 @@ source 'http://rubygems.org'
 <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
 <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
 
-# Gems used only for assets and not required
-# in production environments by default.
 <%= assets_gemfile_entry %>
-
 <%= javascript_gemfile_entry %>
 
 # Use unicorn as the web server
-- 
cgit v1.2.3


From bfde0636dd1b1252436ea3c42ddae2eecd2e554b Mon Sep 17 00:00:00 2001
From: Dan Gebhardt <dan@cerebris.com>
Date: Tue, 26 Jul 2011 15:41:08 -0400
Subject: Include empty app/mailers directory in mountable and full plugins

---
 railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb   | 1 +
 .../generators/rails/plugin_new/templates/app/mailers/.empty_directory   | 0
 2 files changed, 1 insertion(+)
 create mode 100644 railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 56b1587760..c46422437d 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -19,6 +19,7 @@ module Rails
         empty_directory_with_gitkeep "app/controllers"
         empty_directory_with_gitkeep "app/views"
         empty_directory_with_gitkeep "app/helpers"
+        empty_directory_with_gitkeep "app/mailers"
         empty_directory_with_gitkeep "app/assets/images/#{name}"
       end
     end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory b/railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 076afd0e22caaa307f5fddeca8a5749586654852 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 31 Jul 2011 21:39:10 +0530
Subject: fixes #2368. rake about not showing the middleware, db adapter and db
 schema version

---
 railties/lib/rails/tasks/misc.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 833fcb6f72..8b4775d1d3 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -14,7 +14,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about do
+task :about => :environment do
   puts Rails::Info
 end
 
-- 
cgit v1.2.3


From f86f7702507f477eb8f0a8e914bdb53219fac953 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 28 Jul 2011 11:56:08 +0300
Subject: MassAssignmentProtection: consider 'id' insensetive in
 StrictSanitizer

In order to use StrictSanitizer in test mode
Consider :id as not sensetive attribute that can be filtered from
mass assignement without exception.
---
 .../generators/rails/app/templates/config/environments/test.rb.tt    | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index ee068b0202..80198cc21e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -34,6 +34,11 @@
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
+  <%- unless options.skip_active_record? -%>
+  # Raise exception on mass assignment protection for ActiveRecord models
+  config.active_record.mass_assignment_sanitizer = :strict
+  <%- end -%>
+
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end
-- 
cgit v1.2.3


From f9a69e8744546602b567dc5787f7d8ee23073bec Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 1 Aug 2011 12:32:17 -0700
Subject: Merge pull request #2324 from zenapsis/3-1-stable

Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
---
 railties/lib/rails/engine.rb | 6 +++---
 railties/lib/rails/paths.rb  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index c41f7d7c2e..2c3f61f404 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -542,9 +542,9 @@ module Rails
     end
 
     initializer :append_assets_path do |app|
-      app.config.assets.paths.unshift(*paths["vendor/assets"].existent)
-      app.config.assets.paths.unshift(*paths["lib/assets"].existent)
-      app.config.assets.paths.unshift(*paths["app/assets"].existent)
+      app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
+      app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
+      app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
     end
 
     initializer :prepend_helpers_path do |app|
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index de3d0b6fc5..55b820b12e 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -171,6 +171,10 @@ module Rails
       def existent
         expanded.select { |f| File.exists?(f) }
       end
+      
+      def existent_directories
+        expanded.select {|d| Dir.exists?(d) }
+      end
 
       alias to_a expanded
     end
-- 
cgit v1.2.3


From 8293b10425bfe621b4bed85bf3db57cccd70e43b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 1 Aug 2011 17:29:03 -0700
Subject: use File.directory? as Dir.exists? is only 1.9.2+

---
 railties/lib/rails/paths.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 55b820b12e..b37421c09c 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -171,9 +171,9 @@ module Rails
       def existent
         expanded.select { |f| File.exists?(f) }
       end
-      
+
       def existent_directories
-        expanded.select {|d| Dir.exists?(d) }
+        expanded.select { |d| File.directory?(d) }
       end
 
       alias to_a expanded
-- 
cgit v1.2.3


From ab6b61e34c046da944d9b517876a032fe3d0a8a1 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 3 Aug 2011 19:18:34 -0300
Subject: Don't require assets group in production by default, you can change
 this default in the application.rb anyways

---
 .../rails/generators/rails/app/templates/config/application.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 7687b1beac..dd0cf64650 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -13,9 +13,13 @@ require "active_resource/railtie"
 <% end -%>
 
 # If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+# current environment and also include :assets gems if you ...
+if defined?(Bundler)
+  # ... precompile your assets
+  Bundler.require *Rails.groups(:assets => %w(development test))
+  # ... want your assets to be lazily compiled also in production
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module <%= app_const_base %>
   class Application < Rails::Application
-- 
cgit v1.2.3


From f2ea1ddc278d5466f3d3b7c8feb73aa9c78d2628 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 3 Aug 2011 21:04:32 -0300
Subject: Fix a bit precompile and lazy compile comments

---
 .../lib/rails/generators/rails/app/templates/config/application.rb  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index dd0cf64650..86c9bd2d1d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -12,12 +12,10 @@ require "active_resource/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
 
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if you ...
 if defined?(Bundler)
-  # ... precompile your assets
+  # If you precompile assets before deploying to production, use this line
   Bundler.require *Rails.groups(:assets => %w(development test))
-  # ... want your assets to be lazily compiled also in production
+  # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-- 
cgit v1.2.3


From 83eec4ca4c8312e27678c15f87ba2e17532f7f07 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Tue, 16 Aug 2011 01:36:21 +0530
Subject: Requiring delegate.

---
 railties/lib/rails/railtie.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 8c88b25617..e8fb1f3d98 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -2,6 +2,7 @@ require 'rails/initializable'
 require 'rails/configuration'
 require 'active_support/inflector'
 require 'active_support/core_ext/module/introspection'
+require 'active_support/core_ext/module/delegation'
 
 module Rails
   # Railtie is the core of the Rails framework and provides several hooks to extend
-- 
cgit v1.2.3


From 6c5f67cac15c43bafcd917c346cccfcf3fa5fb95 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 16 Aug 2011 00:59:59 +0100
Subject: Don't refer to ActionController::Base in the wrap_parameters
 initializer - use config object instead. Cuts about 15% off the load time.
 (#734)

---
 .../rails/app/templates/config/initializers/wrap_parameters.rb.tt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index fa1548db8b..45c7e531ba 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -4,7 +4,7 @@
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters <%= key_value :format, "[:json]" %>
+<%= app_const %>.config.wrap_parameters <%= key_value :format, "[:json]" %>
 
 # Disable root element in JSON by default.
 if defined?(ActiveRecord)
-- 
cgit v1.2.3


From f76842f57e3f4e9292867a456abd90c034230916 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 16 Aug 2011 02:28:13 +0100
Subject: Fix wrap_parameters initializer template

---
 .../rails/app/templates/config/initializers/wrap_parameters.rb.tt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index 45c7e531ba..a52917351d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -4,7 +4,7 @@
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-<%= app_const %>.config.wrap_parameters <%= key_value :format, "[:json]" %>
+<%= app_const %>.config.wrap_parameters = { <%= key_value :format, "[:json]" %> }
 
 # Disable root element in JSON by default.
 if defined?(ActiveRecord)
-- 
cgit v1.2.3


From 4dd985ae9514fdb9688eab780d881decff8358fa Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 16 Aug 2011 15:13:57 +0100
Subject: Don't reference ActiveRecord::Base in
 initializers/wrap_parameters.rb. Use config.active_record instead. This
 yields about a 20% decrease in startup time because it means that the
 connection is not created immediately on startup. Of course, this is only
 useful if you are not going to immediately use the database after startup.

---
 .../app/templates/config/initializers/wrap_parameters.rb.tt  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index a52917351d..b7b344a62d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -3,10 +3,12 @@
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
-# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-<%= app_const %>.config.wrap_parameters = { <%= key_value :format, "[:json]" %> }
+<%= app_const %>.configure do
+  # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+  config.action_controller.wrap_parameters = { <%= key_value :format, "[:json]" %> }
 
-# Disable root element in JSON by default.
-if defined?(ActiveRecord)
-  ActiveRecord::Base.include_root_in_json = false
+  <%- unless options.skip_active_record? -%>
+  # Disable root element in JSON by default.
+  config.active_record.include_root_in_json = false
+  <%- end -%>
 end
-- 
cgit v1.2.3


From 8e236152457ed48bb436e9bffb4c5d6d4b6a26d4 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 16 Aug 2011 19:14:06 +0100
Subject: Use lazy load hooks to set parameter wrapping configuration. This
 means that it doesn't force Action Controller / Active Record to load, but it
 doesn't fail if they have already loaded. Thanks @josevalim for the hint.

---
 .../templates/config/initializers/wrap_parameters.rb.tt  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index b7b344a62d..d640f578da 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -3,12 +3,14 @@
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
-<%= app_const %>.configure do
-  # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-  config.action_controller.wrap_parameters = { <%= key_value :format, "[:json]" %> }
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters <%= key_value :format, "[:json]" %>
+end
 
-  <%- unless options.skip_active_record? -%>
-  # Disable root element in JSON by default.
-  config.active_record.include_root_in_json = false
-  <%- end -%>
+<%- unless options.skip_active_record? -%>
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
 end
+<%- end -%>
-- 
cgit v1.2.3


From 3ebb322f2180e8b9dada05706172f75d185923d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=20Garc=C3=ADa?= <contacto@rafagarcia.net>
Date: Wed, 17 Aug 2011 04:01:07 +0200
Subject: Cleanup application.css

---
 .../rails/app/templates/app/assets/stylesheets/application.css      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
index 9e07c7d9a9..3b5cc6648e 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
@@ -4,10 +4,10 @@
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- * 
+ *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree . 
-*/
\ No newline at end of file
+ *= require_tree .
+*/
-- 
cgit v1.2.3


From 18b2223b3290c4b3daa310edfc06b4d51161c312 Mon Sep 17 00:00:00 2001
From: "Andrey A.I. Sitnik" <andrey@sitnik.ru>
Date: Mon, 22 Aug 2011 09:36:36 +1100
Subject: Allow to debug assets by config.assets.debug

---
 railties/lib/rails/application/configuration.rb                        | 1 +
 .../rails/app/templates/config/environments/development.rb.tt          | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index cd850b6a75..f1add68890 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -38,6 +38,7 @@ module Rails
         @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
         @assets.prefix     = "/assets"
         @assets.version    = ''
+        @assets.debug      = false
 
         @assets.cache_store    = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor  = nil
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 3e0c29a587..47078e3af9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -29,4 +29,7 @@
 
   # Do not compress assets
   config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end
-- 
cgit v1.2.3


From 44f0d94469fb6c5d400776c3307b16fb8e4d1eb1 Mon Sep 17 00:00:00 2001
From: Andrey Ognevsky <a.ognevsky@gmail.com>
Date: Sun, 21 Aug 2011 01:25:11 +0300
Subject: Add Destroy Alias

* Added destroy alias to rails generator

* add alias info for destroy command

* Updated command line guides
---
 railties/lib/rails/commands.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index a21484e5cb..ada150ceec 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -4,6 +4,7 @@ ARGV << '--help' if ARGV.empty?
 
 aliases = {
   "g"  => "generate",
+  "d"  => "destroy",
   "c"  => "console",
   "s"  => "server",
   "db" => "dbconsole",
@@ -87,7 +88,7 @@ The most common rails commands are:
 
 In addition to those, there are:
  application  Generate the Rails application code
- destroy      Undo code generated with "generate"
+ destroy      Undo code generated with "generate" (short-cut alias: "d")
  benchmarker  See how fast a piece of code runs
  profiler     Get profile information from a piece of code
  plugin       Install a plugin
-- 
cgit v1.2.3


From d17954c7d826b64ae7d04aac4db6f919d5e22589 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 22 Aug 2011 23:39:17 -0500
Subject: Add destroy alias to engines

---
 railties/lib/rails/engine/commands.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index 3b0920e213..b71119af77 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -3,7 +3,8 @@ require 'active_support/core_ext/object/inclusion'
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
-  "g" => "generate"
+  "g" => "generate",
+  "d" => "destroy"
 }
 
 command = ARGV.shift
@@ -30,7 +31,7 @@ Usage: rails COMMAND [ARGS]
 
 The common rails commands available for engines are:
  generate    Generate new code (short-cut alias: "g")
- destroy     Undo code generated with "generate"
+ destroy     Undo code generated with "generate" (short-cut alias: "d")
 
 All commands can be run with -h for more information.
   EOT
-- 
cgit v1.2.3


From 827cdae6fb5e21056b68ab8a89047ae82738871f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 22 Aug 2011 23:19:25 -0500
Subject: Add config.allow_debugging option to determine if the debug_assets
 query param can be passed by user

---
 railties/lib/rails/application/configuration.rb             | 13 +++++++------
 .../app/templates/config/environments/development.rb.tt     |  3 +++
 .../rails/app/templates/config/environments/test.rb.tt      |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f1add68890..c4a02ba5c0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -33,12 +33,13 @@ module Rails
         @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
 
         @assets = ActiveSupport::OrderedOptions.new
-        @assets.enabled    = false
-        @assets.paths      = []
-        @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
-        @assets.prefix     = "/assets"
-        @assets.version    = ''
-        @assets.debug      = false
+        @assets.enabled         = false
+        @assets.paths           = []
+        @assets.precompile      = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
+        @assets.prefix          = "/assets"
+        @assets.version         = ''
+        @assets.debug           = false
+        @assets.allow_debugging = false
 
         @assets.cache_store    = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor  = nil
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 47078e3af9..33f9939ffe 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -30,6 +30,9 @@
   # Do not compress assets
   config.assets.compress = false
 
+  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
+  config.assets.allow_debugging = true
+
   # Expands the lines which load the assets
   config.assets.debug = true
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..8e33a65b2d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -41,4 +41,7 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
+  config.assets.allow_debugging = true
 end
-- 
cgit v1.2.3


From 44f07098fe415593e7721afe89e40581d7dc35d3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 24 Aug 2011 13:25:11 -0700
Subject: dealing with some -w warnings on startup

---
 railties/lib/rails/application.rb           | 5 +++++
 railties/lib/rails/application/bootstrap.rb | 2 +-
 railties/lib/rails/engine.rb                | 1 +
 railties/lib/rails/plugin.rb                | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index fb60ddd9b5..528c96ef3e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -55,6 +55,11 @@ module Rails
 
     delegate :default_url_options, :default_url_options=, :to => :routes
 
+    def initialize
+      super
+      @initialized = false
+    end
+
     # This method is called just after an application inherits from Rails::Application,
     # allowing the developer to load classes in lib and use them during application
     # configuration.
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 9f21d273e6..c9b147d075 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -28,7 +28,7 @@ module Rails
           logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
           logger.auto_flushing = false if Rails.env.production?
           logger
-        rescue StandardError => e
+        rescue StandardError
           logger = ActiveSupport::BufferedLogger.new(STDERR)
           logger.level = ActiveSupport::BufferedLogger::WARN
           logger.warn(
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2c3f61f404..89b151beb6 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -360,6 +360,7 @@ module Rails
       end
 
       def endpoint(endpoint = nil)
+        @endpoint ||= nil
         @endpoint = endpoint if endpoint
         @endpoint
       end
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index ceddd25eaa..4988cc3378 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -74,7 +74,8 @@ module Rails
     initializer :load_init_rb, :before => :load_config_initializers do |app|
       init_rb = File.expand_path("init.rb", root)
       if File.file?(init_rb)
-        config = app.config
+        # FIXME: do we call this for side effects??
+        app.config
         # TODO: think about evaling initrb in context of Engine (currently it's
         # always evaled in context of Rails::Application)
         eval(File.read(init_rb), binding, init_rb)
-- 
cgit v1.2.3


From 3096629d297a77a9b64747a0ac2df6b2cbf47a68 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 24 Aug 2011 16:23:24 -0700
Subject: we are *sure* we want to set the encoding, so silence warnings around
 it

---
 railties/lib/rails.rb                           | 6 ++++--
 railties/lib/rails/application/configuration.rb | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index de412553aa..73bdd0b552 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -22,8 +22,10 @@ require 'action_dispatch/railtie'
 if RUBY_VERSION < '1.9'
   $KCODE='u'
 else
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
+  silence_warnings do
+    Encoding.default_external = Encoding::UTF_8
+    Encoding.default_internal = Encoding::UTF_8
+  end
 end
 
 module Rails
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index c4a02ba5c0..00322528b5 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/encoding'
+require 'active_support/core_ext/kernel/reporting'
 require 'rails/engine/configuration'
 
 module Rails
@@ -53,8 +54,10 @@ module Rails
       def encoding=(value)
         @encoding = value
         if "ruby".encoding_aware?
-          Encoding.default_external = value
-          Encoding.default_internal = value
+          silence_warnings do
+            Encoding.default_external = value
+            Encoding.default_internal = value
+          end
         else
           $KCODE = value
           if $KCODE == "NONE"
-- 
cgit v1.2.3


From 4af431285bfd1d7a1eeebb2d55b3613cc37a7c52 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 24 Aug 2011 16:33:36 -0700
Subject: only define the encoding reader since we define the writer later on

---
 railties/lib/rails/application/configuration.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 00322528b5..5d7bd3282d 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -7,12 +7,13 @@ module Rails
     class Configuration < ::Rails::Engine::Configuration
       attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
                     :cache_classes, :cache_store, :consider_all_requests_local,
-                    :dependency_loading, :encoding, :filter_parameters,
+                    :dependency_loading, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
                     :static_cache_control, :session_options, :time_zone, :whiny_nils
 
       attr_writer :log_level
+      attr_reader :encoding
 
       def initialize(*)
         super
-- 
cgit v1.2.3


From 32836e7a538118d4ed831ded7fce0ae83fc3d860 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 24 Aug 2011 16:48:30 -0700
Subject: fix ambiguous use of *

---
 railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 86c9bd2d1d..3891829150 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -14,7 +14,7 @@ require "active_resource/railtie"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
-- 
cgit v1.2.3


From 68424fb1cf45acda3ad1daef30136f3bcd4f9f9d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 24 Aug 2011 16:52:23 -0700
Subject: fix ambiguous * and remove unused variable

---
 railties/lib/rails/generators.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index fdafc91fcb..27f8d13ce8 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -77,7 +77,7 @@ module Rails
       fallbacks.merge! config.fallbacks
       templates_path.concat config.templates
       templates_path.uniq!
-      hide_namespaces *config.hidden_namespaces
+      hide_namespaces(*config.hidden_namespaces)
     end
 
     def self.templates_path
@@ -313,7 +313,7 @@ module Rails
             begin
               path = path.sub("#{base}/", "")
               require path
-            rescue Exception => e
+            rescue Exception
               # No problem
             end
           end
-- 
cgit v1.2.3


From a840172c535ae1f8bf29a397185053b85d7b4398 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Thu, 25 Aug 2011 09:06:11 +0530
Subject: Yes we need this to pass the test. we are using config.log_level.

Fix broken test test_copying_migrations(RailtiesTest::EngineTest):
NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
---
 railties/lib/rails/plugin.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 4988cc3378..3e27688bb9 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -74,8 +74,8 @@ module Rails
     initializer :load_init_rb, :before => :load_config_initializers do |app|
       init_rb = File.expand_path("init.rb", root)
       if File.file?(init_rb)
-        # FIXME: do we call this for side effects??
-        app.config
+        # This double assignment is to prevent an "unused variable" warning on Ruby 1.9.3.
+        config = config = app.config
         # TODO: think about evaling initrb in context of Engine (currently it's
         # always evaled in context of Rails::Application)
         eval(File.read(init_rb), binding, init_rb)
-- 
cgit v1.2.3


From 1606b6c7e4af5ebc0bc705f3c4e4ea63b038ef14 Mon Sep 17 00:00:00 2001
From: Jared Tame <jmtame@gmail.com>
Date: Tue, 23 Aug 2011 02:26:55 -0700
Subject: fixed 500 error message which is misleading by suggesting all rails
 apps have exception notifications by default

---
 railties/lib/rails/generators/rails/app/templates/public/500.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html
index b80307fc16..b8e4d7c721 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/500.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/500.html
@@ -20,7 +20,7 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+    <p>If you believe you've seen this page in error, please notify the site owner.</p>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 5acbc19f30b6d27ea9b131aa75bb23643d216088 Mon Sep 17 00:00:00 2001
From: Teng Siong Ong <siong1987@gmail.com>
Date: Sat, 27 Aug 2011 14:31:24 -0500
Subject: remove misleading line on 500 error page.

---
 railties/lib/rails/generators/rails/app/templates/public/500.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html
index b8e4d7c721..f3648a0dbc 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/500.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/500.html
@@ -20,7 +20,6 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>If you believe you've seen this page in error, please notify the site owner.</p>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From dffdd829930e664cef522f34730d5987be348596 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 29 Aug 2011 16:28:11 -0500
Subject: Read digests of assets from manifest.yml if config.assets.manifest is
 on

---
 railties/lib/rails/application/configuration.rb                  | 9 +++++----
 .../rails/generators/rails/app/templates/config/application.rb   | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 5d7bd3282d..7f4db0a19f 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -42,10 +42,11 @@ module Rails
         @assets.version         = ''
         @assets.debug           = false
         @assets.allow_debugging = false
-
-        @assets.cache_store    = [ :file_store, "#{root}/tmp/cache/assets/" ]
-        @assets.js_compressor  = nil
-        @assets.css_compressor = nil
+        @assets.manifest        = true
+        @assets.precompile_only = false
+        @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
+        @assets.js_compressor   = nil
+        @assets.css_compressor  = nil
       end
 
       def compiled_asset_path
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 3891829150..30a75200cb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -52,6 +52,10 @@ module <%= app_const_base %>
 <% unless options.skip_sprockets? -%>
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Create a manifest with the hashes of your assets when you run "rake assets:precompile".
+    # Use this if you don't have a JavaScript engine in your production servers
+    config.assets.manifest = true
 <% end -%>
   end
 end
-- 
cgit v1.2.3


From fa04c37f45ca9299a5efb426913488b678c178ce Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 31 Aug 2011 12:42:54 -0500
Subject: Backport b0f30631662 to master

---
 .../lib/rails/generators/rails/app/templates/config/application.rb   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 30a75200cb..13fbe9e526 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -53,9 +53,8 @@ module <%= app_const_base %>
     # Enable the asset pipeline
     config.assets.enabled = true
 
-    # Create a manifest with the hashes of your assets when you run "rake assets:precompile".
-    # Use this if you don't have a JavaScript engine in your production servers
-    config.assets.manifest = true
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
 <% end -%>
   end
 end
-- 
cgit v1.2.3


From f236e00189b5a6cf0cebac5c275f64d41d73428d Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 31 Aug 2011 12:47:33 -0500
Subject: Backport f443f9cb0c64 to master

---
 railties/lib/rails/application/configuration.rb                     | 5 ++---
 .../rails/app/templates/config/environments/development.rb.tt       | 3 ---
 .../rails/app/templates/config/environments/production.rb.tt        | 6 ++++++
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7f4db0a19f..85e0cd5061 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -41,9 +41,8 @@ module Rails
         @assets.prefix          = "/assets"
         @assets.version         = ''
         @assets.debug           = false
-        @assets.allow_debugging = false
-        @assets.manifest        = true
-        @assets.precompile_only = false
+        @assets.compile         = true
+        @assets.digest          = false
         @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor   = nil
         @assets.css_compressor  = nil
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 33f9939ffe..47078e3af9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -30,9 +30,6 @@
   # Do not compress assets
   config.assets.compress = false
 
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
-
   # Expands the lines which load the assets
   config.assets.debug = true
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index de56d47688..b4754cfc6d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -14,6 +14,12 @@
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-- 
cgit v1.2.3


From d0b3937b8fe2cbc4385e843d47249af3e7181a83 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 30 Aug 2011 16:30:53 -0500
Subject: Set default location of manifest with config.assets.manifest

---
 railties/lib/rails/application/configuration.rb                        | 1 +
 .../rails/app/templates/config/environments/production.rb.tt           | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 85e0cd5061..fa7e3b820b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -43,6 +43,7 @@ module Rails
         @assets.debug           = false
         @assets.compile         = true
         @assets.digest          = false
+        @assets.manifest        = "#{root}/public#{@assets.prefix}"
         @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor   = nil
         @assets.css_compressor  = nil
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index b4754cfc6d..64e2c09467 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -20,6 +20,9 @@
   # Generate digests for assets URLs
   config.assets.digest = true
 
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-- 
cgit v1.2.3


From 3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 31 Aug 2011 18:50:38 -0700
Subject: Merge pull request #2780 from
 guilleiguaran/assets-pipeline-minor-changes

Assets pipeline: fix in manifest location and remove unused code
---
 railties/lib/rails/application/configuration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index fa7e3b820b..0ca664e4f0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -43,7 +43,7 @@ module Rails
         @assets.debug           = false
         @assets.compile         = true
         @assets.digest          = false
-        @assets.manifest        = "#{root}/public#{@assets.prefix}"
+        @assets.manifest        = nil
         @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
         @assets.js_compressor   = nil
         @assets.css_compressor  = nil
-- 
cgit v1.2.3


From e61d6afbab24163d37a73b25262ef73119b99a78 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Fri, 2 Sep 2011 13:31:00 +0400
Subject: fix indent for generator environment method

---
 railties/lib/rails/generators/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index b8541c236e..a7462f39ba 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -97,7 +97,7 @@ module Rails
 
         in_root do
           if options[:env].nil?
-            inject_into_file 'config/application.rb', "\n  #{data}", :after => sentinel, :verbose => false
+            inject_into_file 'config/application.rb', "\n    #{data}", :after => sentinel, :verbose => false
           else
             Array.wrap(options[:env]).each do |env|
               inject_into_file "config/environments/#{env}.rb", "\n  #{data}", :after => env_file_sentinel, :verbose => false
-- 
cgit v1.2.3


From af54fc5586f00bbb82063f5110801ef08ad9ff39 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 3 Sep 2011 00:05:37 -0500
Subject: Add bcrypt-ruby to Gemfile template

---
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index c83e7ddf80..910cd16950 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -10,6 +10,9 @@ source 'http://rubygems.org'
 <%= assets_gemfile_entry %>
 <%= javascript_gemfile_entry %>
 
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
 # Use unicorn as the web server
 # gem 'unicorn'
 
-- 
cgit v1.2.3


From 0a38e2a5ce2eaf7393958721edbfcf2a7fe87334 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 3 Sep 2011 15:20:18 -0700
Subject: restores the API docs of AR::Fixtures, made a quick pass over them,
 revises link in fixture template [closes #2840]

---
 railties/lib/rails/generators/test_unit/model/templates/fixtures.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index d4138ca2f5..5c8780aa64 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -1,4 +1,4 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 <% unless attributes.empty? -%>
 one:
-- 
cgit v1.2.3


From 34618e6697475bca8b4bcfaaa2d55a99e78c031a Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Sun, 4 Sep 2011 08:17:53 +0530
Subject: Warnings removed for using shadow variable.

---
 railties/lib/rails/generators/actions.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index a7462f39ba..c43a99e85c 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -119,8 +119,8 @@ module Rails
         if commands.is_a?(Symbol)
           run "git #{commands}"
         else
-          commands.each do |command, options|
-            run "git #{command} #{options}"
+          commands.each do |cmd, options|
+            run "git #{cmd} #{options}"
           end
         end
       end
-- 
cgit v1.2.3


From a6c60222c580e4002152b1ac1857673038b1fd42 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Sun, 4 Sep 2011 08:24:02 +0530
Subject: Modified content in guides and comments for "assert /" warnings.
 Removed because if somebody will use this code they will get warnings!

---
 railties/lib/rails/generators/test_case.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index ee85b70bb5..7319fb79f6 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -81,7 +81,7 @@ module Rails
       #
       #   assert_file "app/controller/products_controller.rb" do |controller|
       #     assert_instance_method :index, content do |index|
-      #       assert_match /Product\.all/, index
+      #       assert_match(/Product\.all/, index)
       #     end
       #   end
       #
@@ -148,7 +148,7 @@ module Rails
       #
       #   assert_migration "db/migrate/create_products.rb" do |migration|
       #     assert_class_method :up, migration do |up|
-      #       assert_match /create_table/, up
+      #       assert_match(/create_table/, up)
       #     end
       #   end
       #
@@ -161,7 +161,7 @@ module Rails
       #
       #   assert_file "app/controller/products_controller.rb" do |controller|
       #     assert_instance_method :index, content do |index|
-      #       assert_match /Product\.all/, index
+      #       assert_match(/Product\.all/, index)
       #     end
       #   end
       #
-- 
cgit v1.2.3


From 47bc5d0cc8dec79c0c64ade7d453b60f846424a9 Mon Sep 17 00:00:00 2001
From: Wojciech Mach <wojtek@wojtekmach.pl>
Date: Sun, 4 Sep 2011 10:14:53 +0200
Subject: Add gem_group support to generators

---
 railties/lib/rails/generators/actions.rb | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index a7462f39ba..49e8a4a37d 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -68,7 +68,32 @@ module Rails
         end
 
         in_root do
-          append_file "Gemfile", "gem #{parts.join(", ")}\n", :verbose => false
+          str = "gem #{parts.join(", ")}\n"
+          str = "  " + str if @in_group
+          append_file "Gemfile", str, :verbose => false
+        end
+      end
+
+      # Wraps gem entries inside a group.
+      #
+      # ==== Example
+      #
+      #   gem_group :development, :test do
+      #     gem "rspec-rails"
+      #   end
+      #
+      def gem_group(*names, &block)
+        name = names.map(&:inspect).join(", ")
+        log :gemfile, "group #{name}"
+
+        in_root do
+          append_file "Gemfile", "\ngroup #{name} do\n", :force => true
+
+          @in_group = true
+          instance_eval &block
+          @in_group = false
+
+          append_file "Gemfile", "end\n", :force => true
         end
       end
 
-- 
cgit v1.2.3


From e8cb06a386d045eb6250ab08242b705ad204db7b Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 5 Sep 2011 08:59:37 -0500
Subject: Remove unused config variable from test.rb template

---
 .../generators/rails/app/templates/config/environments/test.rb.tt      | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 8e33a65b2d..80198cc21e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -41,7 +41,4 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end
-- 
cgit v1.2.3


From bd17c762ae6982866e7da2544eb20e5586659786 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 5 Sep 2011 20:33:26 -0300
Subject: Bump uglifier up

---
 railties/lib/rails/generators/app_base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 21a2ae4e28..105bae20c4 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -205,7 +205,7 @@ module Rails
           group :assets do
             gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
             gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
-            gem 'uglifier'
+            gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE
       end
-- 
cgit v1.2.3


From 8b635596b705de6abb289305897dc911f86b4be9 Mon Sep 17 00:00:00 2001
From: "Wayne E. Seguin" <wayneeseguin@gmail.com>
Date: Wed, 7 Sep 2011 17:27:32 -0300
Subject: Thanks to the hard work of Ken Collins ( @metaskills ) on the
 ActiveRecord SQLServer Adapter (
 https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR
 SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver
 adapter should include so that users may use it with the new application
 generator:

    rails new w00t -d sqlserver ...
---
 railties/lib/rails/generators/app_base.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 105bae20c4..93f5023a7a 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -9,7 +9,7 @@ require 'uri'
 module Rails
   module Generators
     class AppBase < Base
-      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver )
       JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
       DATABASES.concat(JDBC_DATABASES)
 
@@ -154,12 +154,13 @@ module Rails
       end
 
       def gem_for_database
-        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db jdbcmysql jdbcsqlite3 jdbcpostgresql )
+        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
         case options[:database]
         when "oracle"     then "ruby-oci8"
         when "postgresql" then "pg"
         when "frontbase"  then "ruby-frontbase"
         when "mysql"      then "mysql2"
+        when "sqlserver"  then "activerecord-sqlserver-adapter"
         when "jdbcmysql"      then "activerecord-jdbcmysql-adapter"
         when "jdbcsqlite3"    then "activerecord-jdbcsqlite3-adapter"
         when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
-- 
cgit v1.2.3


From 901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607 Mon Sep 17 00:00:00 2001
From: Alex Yakoubian <alex@simplevue.com>
Date: Thu, 8 Sep 2011 13:44:08 -0700
Subject: Fixed assets precompile regex, now accepts Procs

---
 railties/lib/rails/application/configuration.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 0ca664e4f0..a48db3b6d2 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -37,7 +37,8 @@ module Rails
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled         = false
         @assets.paths           = []
-        @assets.precompile      = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
+        @assets.precompile      = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
+                                    /application.(css|js)$/ ]
         @assets.prefix          = "/assets"
         @assets.version         = ''
         @assets.debug           = false
-- 
cgit v1.2.3


From 7bc6a0098b4799ac82bfa84ffe171c3d67b87551 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 9 Sep 2011 18:50:32 -0700
Subject: move route inspecting to an object so that we can more easily test it

---
 railties/lib/rails/application/route_inspector.rb | 42 +++++++++++++++++++++++
 railties/lib/rails/tasks/routes.rake              | 34 ++----------------
 2 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 railties/lib/rails/application/route_inspector.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
new file mode 100644
index 0000000000..15c6d035e5
--- /dev/null
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -0,0 +1,42 @@
+module Rails
+  class Application
+    ##
+    # This class is just used for displaying route information when someone
+    # executes `rake routes`.  People should not use this class.
+    class RouteInspector # :nodoc:
+      def format all_routes, filter = nil
+        if filter
+          all_routes = all_routes.select{ |route| route.defaults[:controller] == filter }
+        end
+
+        routes = all_routes.collect do |route|
+
+          reqs = route.requirements.dup
+          rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
+
+          endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
+          constraints = reqs.except(:controller, :action)
+
+          reqs = endpoint == '#' ? '' : endpoint
+
+          unless constraints.empty?
+            reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
+          end
+
+          {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+        end
+
+        # Skip the route if it's internal info route
+        routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+
+        name_width = routes.map{ |r| r[:name].length }.max
+        verb_width = routes.map{ |r| r[:verb].length }.max
+        path_width = routes.map{ |r| r[:path].length }.max
+
+        routes.map do |r|
+          "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
+        end
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 0c26bcf790..7dc54144da 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -3,35 +3,7 @@ task :routes => :environment do
   Rails.application.reload_routes!
   all_routes = Rails.application.routes.routes
 
-  if ENV['CONTROLLER']
-    all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
-  end
-
-  routes = all_routes.collect do |route|
-
-    reqs = route.requirements.dup
-    rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
-
-    endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
-    constraints = reqs.except(:controller, :action)
-
-    reqs = endpoint == '#' ? '' : endpoint
-
-    unless constraints.empty?
-      reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
-    end
-
-    {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
-  end
-
-   # Skip the route if it's internal info route
-  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
-
-  name_width = routes.map{ |r| r[:name].length }.max
-  verb_width = routes.map{ |r| r[:verb].length }.max
-  path_width = routes.map{ |r| r[:path].length }.max
-
-  routes.each do |r|
-    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
-  end
+  require 'rails/application/route_inspector'
+  inspector = Rails::Application::RouteInspector.new
+  puts inspector.format(all_routes, ENV['CONTROLLER']).join "\n"
 end
-- 
cgit v1.2.3


From d21e0e2af3d9b21399244c3f3f73378d75cd4697 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 11 Sep 2011 17:14:42 -0700
Subject: adjust route inspection to work with Journey

---
 railties/lib/rails/application/route_inspector.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 15c6d035e5..8c6911e6bb 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -23,7 +23,8 @@ module Rails
             reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
           end
 
-          {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+          verb = route.verb.source.gsub(/[$^]/, '')
+          {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
         end
 
         # Skip the route if it's internal info route
-- 
cgit v1.2.3


From 68ec26c70c38c388822a7acd8682ac97d0d43b5e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 12 Sep 2011 16:49:36 -0700
Subject: point rails at Journey for dev and edge

---
 railties/lib/rails/generators/app_base.rb                | 2 ++
 railties/lib/rails/generators/rails/app/app_generator.rb | 1 +
 2 files changed, 3 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 93f5023a7a..294563ad06 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,10 +138,12 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
+            gem 'journey',   :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index d9dd33518a..9cbda6649d 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -139,6 +139,7 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
+    JOURNEY_DEV_PATH = File.expand_path("../../../../../../../journey", File.dirname(__FILE__))
 
     RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
 
-- 
cgit v1.2.3


From 6e63e029b335b1a5dfce43c20de27ca6fae29fa4 Mon Sep 17 00:00:00 2001
From: Alex Yakoubian <alex@simplevue.com>
Date: Wed, 14 Sep 2011 23:14:23 -0700
Subject: Default precompile regexp that properly matches application.js and
 application.css

---
 railties/lib/rails/application/configuration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a48db3b6d2..141b39fb4b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -38,7 +38,7 @@ module Rails
         @assets.enabled         = false
         @assets.paths           = []
         @assets.precompile      = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
-                                    /application.(css|js)$/ ]
+                                    /(?:\/|\\|\A)application\.(css|js)$/ ]
         @assets.prefix          = "/assets"
         @assets.version         = ''
         @assets.debug           = false
-- 
cgit v1.2.3


From 007f56701102647088673d92b165c3d862fbba22 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 21 Sep 2011 20:51:30 -0300
Subject: Add jquery-rails to Gemfile of plugins, test/dummy app uses it.
 Closes #3091

---
 railties/lib/rails/generators/rails/plugin_new/templates/Gemfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 160baa6906..f4efd3af74 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -5,6 +5,9 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
+# jquery-rails is used by the dummy application
+gem "jquery-rails"
+
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
@@ -17,4 +20,4 @@ gemspec
 
 <% end -%>
 # To use debugger
-# <%= ruby_debugger_gemfile_entry %>
\ No newline at end of file
+# <%= ruby_debugger_gemfile_entry %>
-- 
cgit v1.2.3


From eb367afeed2905d1036f46940aa6c91323f7faab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Sep 2011 01:56:49 +0200
Subject: `rake assets:precompile` loads the application but does not
 initialize it.

To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.

Conflicts:

	railties/CHANGELOG
	railties/test/application/assets_test.rb
---
 railties/lib/rails/application.rb           |  5 ++---
 railties/lib/rails/application/bootstrap.rb | 16 ++++++++--------
 railties/lib/rails/engine.rb                |  4 ++--
 railties/lib/rails/initializable.rb         |  8 ++++++--
 4 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 528c96ef3e..90d7d27af1 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -83,7 +83,6 @@ module Rails
       require environment if environment
     end
 
-
     def reload_routes!
       routes_reloader.reload!
     end
@@ -92,9 +91,9 @@ module Rails
       @routes_reloader ||= RoutesReloader.new
     end
 
-    def initialize!
+    def initialize!(group=nil)
       raise "Application has been already initialized." if @initialized
-      run_initializers(self)
+      run_initializers(group, self)
       @initialized = true
       self
     end
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index c9b147d075..0aff05b681 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -7,21 +7,21 @@ module Rails
     module Bootstrap
       include Initializable
 
-      initializer :load_environment_hook do end
+      initializer :load_environment_hook, :group => :all do end
 
-      initializer :load_active_support do
+      initializer :load_active_support, :group => :all do
         require "active_support/all" unless config.active_support.bare
       end
 
       # Preload all frameworks specified by the Configuration#frameworks.
       # Used by Passenger to ensure everything's loaded before forking and
       # to avoid autoload race conditions in JRuby.
-      initializer :preload_frameworks do
+      initializer :preload_frameworks, :group => :all do
         ActiveSupport::Autoload.eager_autoload! if config.preload_frameworks
       end
 
       # Initialize the logger early in the stack in case we need to log some deprecation.
-      initializer :initialize_logger do
+      initializer :initialize_logger, :group => :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
           logger = ActiveSupport::BufferedLogger.new(path)
@@ -41,7 +41,7 @@ module Rails
       end
 
       # Initialize cache early in the stack so railties can make use of it.
-      initializer :initialize_cache do
+      initializer :initialize_cache, :group => :all do
         unless defined?(RAILS_CACHE)
           silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(config.cache_store) }
 
@@ -51,7 +51,7 @@ module Rails
         end
       end
 
-      initializer :set_clear_dependencies_hook do
+      initializer :set_clear_dependencies_hook, :group => :all do
         ActionDispatch::Reloader.to_cleanup do
           ActiveSupport::DescendantsTracker.clear
           ActiveSupport::Dependencies.clear
@@ -60,11 +60,11 @@ module Rails
 
       # Sets the dependency loading mechanism.
       # TODO: Remove files from the $" and always use require.
-      initializer :initialize_dependency_mechanism do
+      initializer :initialize_dependency_mechanism, :group => :all do
         ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
       end
 
-      initializer :bootstrap_hook do |app|
+      initializer :bootstrap_hook, :group => :all do |app|
         ActiveSupport.run_load_hooks(:before_initialize, app)
       end
     end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 89b151beb6..0e1e719596 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -537,12 +537,12 @@ module Rails
       end
     end
 
-    initializer :load_environment_config, :before => :load_environment_hook do
+    initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
       environment = paths["config/environments"].existent.first
       require environment if environment
     end
 
-    initializer :append_assets_path do |app|
+    initializer :append_assets_path, :group => :assets do |app|
       app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 686a2dc0cb..4c1da0a5a5 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -21,6 +21,10 @@ module Rails
         @options[:after]
       end
 
+      def belongs_to?(group)
+        @options[:group] == group || @options[:group] == :all
+      end
+
       def run(*args)
         @context.instance_exec(*args, &block)
       end
@@ -44,10 +48,10 @@ module Rails
       end
     end
 
-    def run_initializers(*args)
+    def run_initializers(group=nil, *args)
       return if instance_variable_defined?(:@ran)
       initializers.tsort.each do |initializer|
-        initializer.run(*args)
+        initializer.run(*args) if group.nil? || initializer.belongs_to?(group)
       end
       @ran = true
     end
-- 
cgit v1.2.3


From cb5c39f8a0af78e933d1fe0456c112db1e97813f Mon Sep 17 00:00:00 2001
From: Justin Leitgeb <justin@stackbuilders.com>
Date: Mon, 26 Sep 2011 22:22:52 -0400
Subject: Make the Rack::SSL middleware configurable

---
 railties/lib/rails/application.rb               | 2 +-
 railties/lib/rails/application/configuration.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 90d7d27af1..2e412147d3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -154,7 +154,7 @@ module Rails
 
         if config.force_ssl
           require "rack/ssl"
-          middleware.use ::Rack::SSL
+          middleware.use ::Rack::SSL, config.ssl_options
         end
 
         if config.serve_static_assets
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 141b39fb4b..c363e53c10 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,7 +10,8 @@ module Rails
                     :dependency_loading, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
-                    :static_cache_control, :session_options, :time_zone, :whiny_nils
+                    :ssl_options, :static_cache_control, :session_options, 
+                    :time_zone, :whiny_nils
 
       attr_writer :log_level
       attr_reader :encoding
@@ -26,6 +27,7 @@ module Rails
         @serve_static_assets         = true
         @static_cache_control        = nil
         @force_ssl                   = false
+        @ssl_options                 = {}
         @session_store               = :cookie_store
         @session_options             = {}
         @time_zone                   = "UTC"
-- 
cgit v1.2.3


From 148e4a541361f140f13aa35bb43b3d57c95831d6 Mon Sep 17 00:00:00 2001
From: Dmitriy Kiriyenko <dmitriy.kiriyenko@anahoret.com>
Date: Thu, 29 Sep 2011 15:35:25 +0300
Subject: Honour RAILS_ENV environment variable when running rake.

---
 railties/lib/rails/generators/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 575f4bb106..5af5d3b856 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -252,7 +252,7 @@ module Rails
       #
       def rake(command, options={})
         log :rake, command
-        env  = options[:env] || 'development'
+        env  = options[:env] || ENV["RAILS_ENV"] || 'development'
         sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
         in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
       end
-- 
cgit v1.2.3


From b0b436ebcea8206015b3f52bb5915a7bba7cc5a9 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 30 Sep 2011 15:56:38 +0530
Subject: warning removed : '&' interpreted as argument prefix

---
 railties/lib/rails/generators/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 5af5d3b856..b26839644e 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -90,7 +90,7 @@ module Rails
           append_file "Gemfile", "\ngroup #{name} do\n", :force => true
 
           @in_group = true
-          instance_eval &block
+          instance_eval(&block)
           @in_group = false
 
           append_file "Gemfile", "end\n", :force => true
-- 
cgit v1.2.3


From 44791a2bc6611b755b418f1db3ca93f9edec0908 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Fri, 30 Sep 2011 12:05:53 -0400
Subject: Modified how to handle if ActiveRecord is defined.

---
 railties/lib/rails/test_help.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 68f566274d..8d0d8cacac 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -24,7 +24,7 @@ if defined?(MiniTest)
   end
 end
 
-if defined?(ActiveRecord)
+if defined?(ActiveRecord::Base)
   require 'active_record/test_case'
 
   class ActiveSupport::TestCase
-- 
cgit v1.2.3


From 7039def6e116b12ccab8142cec7f7feabc264220 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 31 Jul 2011 16:17:37 -0500
Subject: Read extra args for 'rails new' from ~/.railsrc

---
 railties/lib/rails/commands/application.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 1cf23a8b92..dcd4c7a529 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -9,6 +9,13 @@ if ARGV.first != "new"
   ARGV[0] = "--help"
 else
   ARGV.shift
+  railsrc = File.join(File.expand_path("~"), ".railsrc")
+  if File.exist?(railsrc)
+    extra_args_string = File.open(railsrc).read
+    extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+    ARGV << extra_args
+    ARGV.flatten!
+  end
 end
 
 require 'rubygems' if ARGV.include?("--dev")
-- 
cgit v1.2.3


From 101fb42106db4e7e8221a3fec252e51dd84e0bb4 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 2 Oct 2011 01:06:39 -0500
Subject: Print information about .railsrc to users

---
 railties/lib/rails/commands/application.rb    | 1 +
 railties/lib/rails/generators/rails/app/USAGE | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index dcd4c7a529..60d1aed73a 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -13,6 +13,7 @@ else
   if File.exist?(railsrc)
     extra_args_string = File.open(railsrc).read
     extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+    puts "Using #{extra_args.join(" ")} from #{railsrc}"
     ARGV << extra_args
     ARGV.flatten!
   end
diff --git a/railties/lib/rails/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE
index 9e7a78d132..691095f33f 100644
--- a/railties/lib/rails/generators/rails/app/USAGE
+++ b/railties/lib/rails/generators/rails/app/USAGE
@@ -2,6 +2,12 @@ Description:
     The 'rails new' command creates a new Rails application with a default
     directory structure and configuration at the path you specify.
 
+    You can specify extra command-line arguments to be used every time
+    'rails new' runs in the .railsrc configuration file in your home directory.
+
+    Note that the arguments specified in the .railsrc file don't affect the
+    defaults values shown above in this help message.
+
 Example:
     rails new ~/Code/Ruby/weblog
 
-- 
cgit v1.2.3


From 753424079e497d8ab7bc611093a34194200e3c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 2 Oct 2011 12:14:31 +0200
Subject: Provide initialize_on_precompile which, when set to false, does not
 initialize the app for precompilation. Defaults to true.

---
 railties/lib/rails/application/configuration.rb | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index c363e53c10..448521d2f0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -37,19 +37,20 @@ module Rails
         @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
 
         @assets = ActiveSupport::OrderedOptions.new
-        @assets.enabled         = false
-        @assets.paths           = []
-        @assets.precompile      = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
-                                    /(?:\/|\\|\A)application\.(css|js)$/ ]
-        @assets.prefix          = "/assets"
-        @assets.version         = ''
-        @assets.debug           = false
-        @assets.compile         = true
-        @assets.digest          = false
-        @assets.manifest        = nil
-        @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
-        @assets.js_compressor   = nil
-        @assets.css_compressor  = nil
+        @assets.enabled                  = false
+        @assets.paths                    = []
+        @assets.precompile               = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
+                                             /(?:\/|\\|\A)application\.(css|js)$/ ]
+        @assets.prefix                   = "/assets"
+        @assets.version                  = ''
+        @assets.debug                    = false
+        @assets.compile                  = true
+        @assets.digest                   = false
+        @assets.manifest                 = nil
+        @assets.cache_store              = [ :file_store, "#{root}/tmp/cache/assets/" ]
+        @assets.js_compressor            = nil
+        @assets.css_compressor           = nil
+        @assets.initialize_on_precompile = true
       end
 
       def compiled_asset_path
-- 
cgit v1.2.3


From d68884f4fddf5452f1dcbdf1a7b35d5889926fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 2 Oct 2011 22:02:12 +0200
Subject: :group => :assets should only run in the assets environment.

---
 railties/lib/rails/application.rb   | 2 +-
 railties/lib/rails/engine.rb        | 2 +-
 railties/lib/rails/initializable.rb | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2e412147d3..cbb2d23238 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -91,7 +91,7 @@ module Rails
       @routes_reloader ||= RoutesReloader.new
     end
 
-    def initialize!(group=nil)
+    def initialize!(group=:default)
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
       @initialized = true
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 0e1e719596..2d25273050 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -542,7 +542,7 @@ module Rails
       require environment if environment
     end
 
-    initializer :append_assets_path, :group => :assets do |app|
+    initializer :append_assets_path, :group => :all do |app|
       app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 4c1da0a5a5..04d5b55c69 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -10,6 +10,7 @@ module Rails
       attr_reader :name, :block
 
       def initialize(name, context, options, &block)
+        options[:group] ||= :default
         @name, @context, @options, @block = name, context, options, block
       end
 
@@ -48,10 +49,10 @@ module Rails
       end
     end
 
-    def run_initializers(group=nil, *args)
+    def run_initializers(group=:default, *args)
       return if instance_variable_defined?(:@ran)
       initializers.tsort.each do |initializer|
-        initializer.run(*args) if group.nil? || initializer.belongs_to?(group)
+        initializer.run(*args) if initializer.belongs_to?(group)
       end
       @ran = true
     end
-- 
cgit v1.2.3


From 8a4239fc7e6669da9843e5aa28b5ba2a47f26b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 7 Oct 2011 22:25:03 +0200
Subject: testing.rake should set the default task, closes #2564

---
 railties/lib/rails/tasks/misc.rake        | 2 --
 railties/lib/rails/test_unit/testing.rake | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 8b4775d1d3..0dcca36d8b 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -1,5 +1,3 @@
-task :default => :test
-
 task :rails_env do
   # TODO Do we really need this?
   unless defined? RAILS_ENV
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 33da2c0f5a..fa01f42c5b 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -71,6 +71,8 @@ module Kernel
   end
 end
 
+task :default => :test
+
 desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
 task :test do
   tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)
-- 
cgit v1.2.3


From 6c9090d19299f25c4768fccf4920444d470a9ea7 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 8 Oct 2011 14:39:19 +0530
Subject: Sqlnet should also be ignored into the app gitignore

---
 railties/lib/rails/generators/rails/app/templates/gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 923b697662..c376100cfe 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -3,3 +3,4 @@ db/*.sqlite3
 log/*.log
 tmp/
 .sass-cache/
+sqlnet.log
\ No newline at end of file
-- 
cgit v1.2.3


From 96e1dc3440e055e2b1403b0cecaab4f778c13d30 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 8 Oct 2011 12:54:24 -0200
Subject: Revert "Merge pull request #3254 from
 arunagw/app_gitignore_sqlnet_log"

This reverts commit bb8e0673299899c913d664c0fd3c483d8569846c, reversing
changes made to 11687382db08ec1523f71e485c48d6039de25324.
---
 railties/lib/rails/generators/rails/app/templates/gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index c376100cfe..923b697662 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -3,4 +3,3 @@ db/*.sqlite3
 log/*.log
 tmp/
 .sass-cache/
-sqlnet.log
\ No newline at end of file
-- 
cgit v1.2.3


From 1851791803e58dfa19dfe1cb686cf5870e655b27 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 8 Oct 2011 08:04:05 -0700
Subject: Add comments to our generated .gitignore, including a note about when
 to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache,
 which is already ignored.

---
 .../rails/generators/rails/app/templates/gitignore   | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 923b697662..eb3489a986 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -1,5 +1,15 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/
-.sass-cache/
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
-- 
cgit v1.2.3


From ca219a21b60ea20868deab20afaa0335d32f1c17 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 9 Oct 2011 17:15:55 +0530
Subject: Warnings removed when running with 1.9.3

---
 railties/lib/rails/generators/resource_helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index de01c858dd..b34bc4a524 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -65,7 +65,7 @@ module Rails
 
             begin
               "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
-            rescue NameError => e
+            rescue NameError
               Rails::Generators::ActiveModel
             end
           end
-- 
cgit v1.2.3


From 44fc397c801aa09f2b5438f65ab7adb4482d58be Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Mon, 10 Oct 2011 20:10:35 +1100
Subject: Fix rails/generators/base.rb documentation for generator lookup

---
 railties/lib/rails/generators/base.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index b9dc31457a..911f80cf3a 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -91,7 +91,7 @@ module Rails
       #
       # The lookup in this case for test_unit as input is:
       #
-      #   "test_unit:awesome", "test_unit"
+      #   "test_framework:awesome", "test_framework"
       #
       # Which is not the desired the lookup. You can change it by providing the
       # :as option:
@@ -102,7 +102,7 @@ module Rails
       #
       # And now it will lookup at:
       #
-      #   "test_unit:controller", "test_unit"
+      #   "test_framework:controller", "test_framework"
       #
       # Similarly, if you want it to also lookup in the rails namespace, you just
       # need to provide the :base value:
@@ -113,7 +113,7 @@ module Rails
       #
       # And the lookup is exactly the same as previously:
       #
-      #   "rails:test_unit", "test_unit:controller", "test_unit"
+      #   "rails:test_framework", "test_framework:controller", "test_framework"
       #
       # ==== Switches
       #
-- 
cgit v1.2.3


From 43c01ef8b1a49ccb85700d8e248fd10742ede014 Mon Sep 17 00:00:00 2001
From: Sasha Gerrand <sasha.gerrand@salmat.com.au>
Date: Tue, 11 Oct 2011 17:04:24 +1100
Subject: Added method to create vendor/assets/javascripts, added it to methods
 called within vendor method

---
 railties/lib/rails/generators/rails/app/app_generator.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 9cbda6649d..c8648d19f8 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -122,10 +122,15 @@ module Rails
     end
 
     def vendor
+      vendor_javascripts
       vendor_stylesheets
       vendor_plugins
     end
 
+    def vendor_javascripts
+      empty_directory_with_gitkeep "vendor/assets/javascripts"
+    end
+
     def vendor_stylesheets
       empty_directory_with_gitkeep "vendor/assets/stylesheets"
     end
-- 
cgit v1.2.3


From d32a90b9b77d3f7d8098ee6ddb5bf62cb8da0ed7 Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Thu, 13 Oct 2011 10:16:50 -0700
Subject: fix inconsistent alignment in Gemfile generator

---
 railties/lib/rails/generators/app_base.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 294563ad06..134d86fab0 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -150,7 +150,7 @@ module Rails
             gem 'rails', '#{Rails::VERSION::STRING}'
 
             # Bundle edge Rails instead:
-            # gem 'rails',     :git => 'git://github.com/rails/rails.git'
+            # gem 'rails', :git => 'git://github.com/rails/rails.git'
           GEMFILE
         end
       end
@@ -158,11 +158,11 @@ module Rails
       def gem_for_database
         # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
         case options[:database]
-        when "oracle"     then "ruby-oci8"
-        when "postgresql" then "pg"
-        when "frontbase"  then "ruby-frontbase"
-        when "mysql"      then "mysql2"
-        when "sqlserver"  then "activerecord-sqlserver-adapter"
+        when "oracle"         then "ruby-oci8"
+        when "postgresql"     then "pg"
+        when "frontbase"      then "ruby-frontbase"
+        when "mysql"          then "mysql2"
+        when "sqlserver"      then "activerecord-sqlserver-adapter"
         when "jdbcmysql"      then "activerecord-jdbcmysql-adapter"
         when "jdbcsqlite3"    then "activerecord-jdbcsqlite3-adapter"
         when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
-- 
cgit v1.2.3


From c547e968f5709f174ee13818b35429cbe585b5dd Mon Sep 17 00:00:00 2001
From: Steven Anderson <steve@whilefalse.net>
Date: Mon, 17 Oct 2011 16:28:00 +0100
Subject: Added environment rake task to engines

---
 railties/lib/rails/tasks/engine.rake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 2152e811f5..eea8abe7d2 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -2,6 +2,7 @@ task "load_app" do
   namespace :app do
     load APP_RAKEFILE
   end
+  task :environment => "app:environment"
 
   if !defined?(ENGINE_PATH) || !ENGINE_PATH
     ENGINE_PATH = find_engine_path(APP_RAKEFILE)
-- 
cgit v1.2.3


From 7f184aaf4352140c7e3bd33761058bb05737e11b Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 18 Oct 2011 16:03:58 -0200
Subject: Use again Rack's ContentLength middleware

---
 railties/lib/rails/commands/server.rb     |  1 -
 railties/lib/rails/rack.rb                |  1 -
 railties/lib/rails/rack/content_length.rb | 38 -------------------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 railties/lib/rails/rack/content_length.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 23392276d5..71e3711ba1 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,6 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
-      middlewares << [Rails::Rack::ContentLength]
       Hash.new(middlewares)
     end
 
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index d4a41b217e..d1ee96f7fd 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -1,6 +1,5 @@
 module Rails
   module Rack
-    autoload :ContentLength, "rails/rack/content_length"
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
diff --git a/railties/lib/rails/rack/content_length.rb b/railties/lib/rails/rack/content_length.rb
deleted file mode 100644
index 6839af4152..0000000000
--- a/railties/lib/rails/rack/content_length.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'action_dispatch'
-require 'rack/utils'
-
-module Rails
-  module Rack
-    # Sets the Content-Length header on responses with fixed-length bodies.
-    class ContentLength
-      include ::Rack::Utils
-
-      def initialize(app, sendfile=nil)
-        @app = app
-        @sendfile = sendfile
-      end
-
-      def call(env)
-        status, headers, body = @app.call(env)
-        headers = HeaderHash.new(headers)
-
-        if !STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i) &&
-           !headers['Content-Length'] &&
-           !headers['Transfer-Encoding'] &&
-           !(@sendfile && headers[@sendfile])
-
-          old_body = body
-          body, length = [], 0
-          old_body.each do |part|
-            body << part
-            length += bytesize(part)
-          end
-          old_body.close if old_body.respond_to?(:close)
-          headers['Content-Length'] = length.to_s
-        end
-
-        [status, headers, body]
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From d44702c830669e2647c073133bd6b09d7016424d Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 18 Oct 2011 16:14:38 -0200
Subject: Use again Rack's ContentLength middleware part 2

---
 railties/lib/rails/commands/server.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 71e3711ba1..33f9ac017c 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,6 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rack::ContentLength]
       Hash.new(middlewares)
     end
 
-- 
cgit v1.2.3


From 3a746f7c48936bac1c08dcf229c7c8fc74fdfc13 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 19 Oct 2011 12:31:06 -0500
Subject: Use toplevel Rack::ContentLength

---
 railties/lib/rails/commands/server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 33f9ac017c..20484a10c8 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
-      middlewares << [Rack::ContentLength]
+      middlewares << [::Rack::ContentLength]
       Hash.new(middlewares)
     end
 
-- 
cgit v1.2.3


From afde6fdd5ef3e6b0693a7e330777e85ef4cffddb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 12:59:33 -0500
Subject: Added X-Request-Id tracking and TaggedLogging to easily log that and
 other production concerns

---
 railties/lib/rails/application.rb               |  2 ++
 railties/lib/rails/application/bootstrap.rb     |  4 +--
 railties/lib/rails/application/configuration.rb |  2 +-
 railties/lib/rails/rack.rb                      |  1 +
 railties/lib/rails/rack/logger.rb               |  4 +--
 railties/lib/rails/rack/tagged_logging.rb       | 39 +++++++++++++++++++++++++
 6 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 railties/lib/rails/rack/tagged_logging.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index cbb2d23238..a097cfd1be 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -164,6 +164,8 @@ module Rails
         middleware.use ::Rack::Lock unless config.allow_concurrency
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
+        middleware.use ::ActionDispatch::RequestId
+        middleware.use ::Rails::Rack::TaggedLogging, config.log_tags
         middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0aff05b681..c2cb121e42 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -24,12 +24,12 @@ module Rails
       initializer :initialize_logger, :group => :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
-          logger = ActiveSupport::BufferedLogger.new(path)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(path))
           logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
           logger.auto_flushing = false if Rails.env.production?
           logger
         rescue StandardError
-          logger = ActiveSupport::BufferedLogger.new(STDERR)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(STDERR))
           logger.level = ActiveSupport::BufferedLogger::WARN
           logger.warn(
             "Rails Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " +
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 448521d2f0..8f5b28faf8 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,7 +8,7 @@ module Rails
       attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
                     :cache_classes, :cache_store, :consider_all_requests_local,
                     :dependency_loading, :filter_parameters,
-                    :force_ssl, :helpers_paths, :logger, :preload_frameworks,
+                    :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
                     :ssl_options, :static_cache_control, :session_options, 
                     :time_zone, :whiny_nils
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index d1ee96f7fd..b78293e570 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -3,5 +3,6 @@ module Rails
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
+    autoload :TaggedLogging, "rails/rack/tagged_logging"
   end
 end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3be262de08..4d388c4d10 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -21,8 +21,8 @@ module Rails
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
 
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{Time.now.to_default_s}"
+        info "\n\n"
+        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
       end
 
       def after_dispatch(env)
diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
new file mode 100644
index 0000000000..7980319b37
--- /dev/null
+++ b/railties/lib/rails/rack/tagged_logging.rb
@@ -0,0 +1,39 @@
+module Rails
+  module Rack
+    # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
+    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or the symbols :uuid or :subdomain.
+    # The latter two are then automatically expanded to request.uuid and request.subdaomins.first -- the two most common tags
+    # desired in production logs.
+    class TaggedLogging
+      def initialize(app, tags = nil)
+        @app, @tags = app, tags
+      end
+
+      def call(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { @app.call(env) }
+        else
+          @app.call(env)
+        end
+      end
+      
+      private
+        def compute_tags(env)
+          request = ActionDispatch::Request.new(env)
+
+          @tags.collect do |tag|
+            case tag
+            when Proc
+              tag.call(request)
+            when :uuid
+              request.uuid
+            when :subdomain
+              request.subdomains.first
+            else
+              tag
+            end
+          end
+        end
+    end
+  end
+end
-- 
cgit v1.2.3


From 4a4927f753d7f41c0903ab3adfb73be8490c382e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 13:24:28 -0500
Subject: Simplify TaggedLogging symbol shortcuts (thanks Jose!)

---
 railties/lib/rails/rack/tagged_logging.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
index 7980319b37..c519d7c3e6 100644
--- a/railties/lib/rails/rack/tagged_logging.rb
+++ b/railties/lib/rails/rack/tagged_logging.rb
@@ -1,9 +1,8 @@
 module Rails
   module Rack
     # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
-    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or the symbols :uuid or :subdomain.
-    # The latter two are then automatically expanded to request.uuid and request.subdaomins.first -- the two most common tags
-    # desired in production logs.
+    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or symbols representing method
+    # names on request (so :uuid will result in request.uuid being added as a tag).
     class TaggedLogging
       def initialize(app, tags = nil)
         @app, @tags = app, tags
@@ -25,10 +24,8 @@ module Rails
             case tag
             when Proc
               tag.call(request)
-            when :uuid
-              request.uuid
-            when :subdomain
-              request.subdomains.first
+            when Symbol
+              request.send(tag)
             else
               tag
             end
-- 
cgit v1.2.3


From c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:39:11 +0200
Subject: Unify logger and taggedlogging middleware as both address logging
 concerns.

---
 railties/lib/rails/application.rb         |  3 +--
 railties/lib/rails/rack.rb                |  1 -
 railties/lib/rails/rack/logger.rb         | 38 +++++++++++++++++++++----------
 railties/lib/rails/rack/tagged_logging.rb | 36 -----------------------------
 4 files changed, 27 insertions(+), 51 deletions(-)
 delete mode 100644 railties/lib/rails/rack/tagged_logging.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index a097cfd1be..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -165,8 +165,7 @@ module Rails
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
-        middleware.use ::Rails::Rack::TaggedLogging, config.log_tags
-        middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
+        middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         if config.action_dispatch.x_sendfile_header.present?
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index b78293e570..d1ee96f7fd 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -3,6 +3,5 @@ module Rails
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
-    autoload :TaggedLogging, "rails/rack/tagged_logging"
   end
 end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 4d388c4d10..89de10c83d 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -1,32 +1,46 @@
 require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
-        @app = app
+      def initialize(app, tags=nil)
+        @app, @tags = app, tags.presence
       end
 
       def call(env)
-        before_dispatch(env)
-        @app.call(env)
-      ensure
-        after_dispatch(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        else
+          call_app(env)
+        end
       end
 
     protected
 
-      def before_dispatch(env)
+      def call_app(env)
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
-
-        info "\n\n"
-        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        @app.call(env)
+      ensure
+        ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def after_dispatch(env)
-        ActiveSupport::LogSubscriber.flush_all!
+      def compute_tags(env)
+        request = ActionDispatch::Request.new(env)
+
+        @tags.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
       end
     end
   end
diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
deleted file mode 100644
index c519d7c3e6..0000000000
--- a/railties/lib/rails/rack/tagged_logging.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module Rails
-  module Rack
-    # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
-    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or symbols representing method
-    # names on request (so :uuid will result in request.uuid being added as a tag).
-    class TaggedLogging
-      def initialize(app, tags = nil)
-        @app, @tags = app, tags
-      end
-
-      def call(env)
-        if @tags
-          Rails.logger.tagged(compute_tags(env)) { @app.call(env) }
-        else
-          @app.call(env)
-        end
-      end
-      
-      private
-        def compute_tags(env)
-          request = ActionDispatch::Request.new(env)
-
-          @tags.collect do |tag|
-            case tag
-            when Proc
-              tag.call(request)
-            when Symbol
-              request.send(tag)
-            else
-              tag
-            end
-          end
-        end
-    end
-  end
-end
-- 
cgit v1.2.3


From be27bf17e309fcb43fab45cfa1d31cea074a6a72 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 16:24:00 -0500
Subject: Fix the proper production.rb

---
 .../rails/app/templates/config/environments/production.rb.tt         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 64e2c09467..50f2df3d35 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -33,8 +33,11 @@
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-- 
cgit v1.2.3


From 4e9729df3f03ee16445082b7d386ee14b4370461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 20 Oct 2011 00:38:20 +0200
Subject: Don't use :path in Gemfile for --dev except for Rails.

---
 railties/lib/rails/generators/app_base.rb                | 2 +-
 railties/lib/rails/generators/rails/app/app_generator.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 134d86fab0..40961f0c3e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,7 +138,7 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c8648d19f8..3e32f758a4 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -144,8 +144,6 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
-    JOURNEY_DEV_PATH = File.expand_path("../../../../../../../journey", File.dirname(__FILE__))
-
     RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
 
     class AppGenerator < AppBase
-- 
cgit v1.2.3


From bc5d334c7a340c29a4f9a594101832e1abe831a5 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 19:16:43 +0530
Subject: Using middleware name to show proper name in the info

---
 railties/lib/rails/info.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index a1e15092b2..2ba09d7b90 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -91,7 +91,7 @@ module Rails
     end
 
     property 'Middleware' do
-      Rails.configuration.middleware.map(&:inspect)
+      Rails.configuration.middleware.map(&:name)
     end
 
     # The application's location on the filesystem.
-- 
cgit v1.2.3


From 259741ae7324c18782bf97f236230c496bccf948 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 22 Oct 2011 12:28:06 -0700
Subject: Revert "Merge pull request #3405 from arunagw/middleware_name"

This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing
changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4.
---
 railties/lib/rails/info.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 2ba09d7b90..a1e15092b2 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -91,7 +91,7 @@ module Rails
     end
 
     property 'Middleware' do
-      Rails.configuration.middleware.map(&:name)
+      Rails.configuration.middleware.map(&:inspect)
     end
 
     # The application's location on the filesystem.
-- 
cgit v1.2.3


From a458833705cd3e9a0909d0710da84e2009f097ba Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 22 Oct 2011 14:34:05 -0500
Subject: Remove Turn from default Gemfile.

We still looking for a best presentation for tests output.
---
 railties/lib/rails/generators/app_base.rb                 | 11 -----------
 railties/lib/rails/generators/rails/app/templates/Gemfile |  2 --
 2 files changed, 13 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 40961f0c3e..10fdfdd8a9 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -190,17 +190,6 @@ module Rails
         end
       end
 
-      def turn_gemfile_entry
-        unless RUBY_VERSION < "1.9.2" || options[:skip_test_unit]
-          <<-GEMFILE.strip_heredoc
-            group :test do
-              # Pretty printed test output
-              gem 'turn', :require => false
-            end
-          GEMFILE
-        end
-      end
-
       def assets_gemfile_entry
         <<-GEMFILE.strip_heredoc
           # Gems used only for assets and not required
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 910cd16950..d3b8f4d595 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -21,5 +21,3 @@ source 'http://rubygems.org'
 
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
-
-<%= turn_gemfile_entry -%>
-- 
cgit v1.2.3


From 98fbb50ebf531af28deb1312baf943c24990ad25 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Mon, 24 Oct 2011 22:38:10 +0400
Subject: Remove needless to_param in scaffold functional test

---
 .../generators/test_unit/scaffold/templates/functional_test.rb    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 01fe6dda7a..9ec2e34545 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -26,23 +26,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path
-- 
cgit v1.2.3


From aef62c4b4e89e7fa91973c188c9e7f281a44ecd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 26 Oct 2011 09:29:38 +0200
Subject: Scaffold returns 204 No Content for API requests without content.
 This makes scaffold work with jQuery out of the box.

---
 .../generators/rails/scaffold_controller/templates/controller.rb      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 32b961d9fc..4ff15fd288 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -62,7 +62,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
         format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
         format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
@@ -78,7 +78,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to <%= index_helper %>_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end
-- 
cgit v1.2.3


From 3fa8f362ad09a6f94ab012094014e31513ee36e0 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 29 Oct 2011 15:45:04 +0530
Subject: method redefined warning removed!

---
 railties/lib/rails/test_unit/testing.rake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index fa01f42c5b..3d87529ad4 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -61,6 +61,7 @@ end
 
 # Recreated here from Active Support because :uncommitted needs it before Rails is available
 module Kernel
+  remove_method :silence_stderr # Removing old method to prevent method redefined warning
   def silence_stderr
     old_stderr = STDERR.dup
     STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-- 
cgit v1.2.3


From 010622bb989cb9fa3aac600a7fa7bcb894bb081a Mon Sep 17 00:00:00 2001
From: Hendy Tanata <htanata@gmail.com>
Date: Sat, 15 Oct 2011 17:20:54 +0800
Subject: On inpsect routes, show :controller and :action to indicate dynamic.

---
 railties/lib/rails/application/route_inspector.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 8c6911e6bb..8252f21aa7 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -10,20 +10,21 @@ module Rails
         end
 
         routes = all_routes.collect do |route|
+          route_reqs = route.requirements
 
-          reqs = route.requirements.dup
           rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
 
-          endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
-          constraints = reqs.except(:controller, :action)
+          controller = route_reqs[:controller] || ':controller'
+          action     = route_reqs[:action]     || ':action'
 
-          reqs = endpoint == '#' ? '' : endpoint
+          endpoint = rack_app ? rack_app.inspect : "#{controller}##{action}"
+          constraints = route_reqs.except(:controller, :action)
 
-          unless constraints.empty?
-            reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
-          end
+          reqs = endpoint
+          reqs += " #{constraints.inspect}" unless constraints.empty?
 
           verb = route.verb.source.gsub(/[$^]/, '')
+
           {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
         end
 
-- 
cgit v1.2.3


From eabda416b7c66f3b8d03237e7334bd2d14ff9190 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 29 Oct 2011 14:14:13 -0700
Subject: Removing db/seeds.rb is fine. Don't blow up.

---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2d25273050..1c9627734e 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -488,7 +488,7 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds"].existent.first
-      load(seed_file) if File.exist?(seed_file)
+      load(seed_file) if seed_file && File.exist?(seed_file)
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
-- 
cgit v1.2.3


From 5745a5e85e1900c52d169f79ec0802060e110e21 Mon Sep 17 00:00:00 2001
From: Colin MacKenzie IV <sinisterchipmunk@gmail.com>
Date: Wed, 2 Nov 2011 09:00:18 -0400
Subject: treat USAGE as an ERB template

---
 railties/lib/rails/generators/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 911f80cf3a..f38a487a4e 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -34,7 +34,7 @@ module Rails
         usage = source_root && File.expand_path("../USAGE", source_root)
 
         @desc ||= if usage && File.exist?(usage)
-          File.read(usage)
+          ERB.new(File.read(usage)).result(binding)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
         end
-- 
cgit v1.2.3


From 7102a3d7fc55067b6cda1a7eeb3b3452050d9b6b Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 4 Nov 2011 04:50:53 +0900
Subject: move Rails console top level methods to IRB context

---
 railties/lib/rails/console/app.rb     | 48 +++++++++++++++++++----------------
 railties/lib/rails/console/helpers.rb | 14 ++++++----
 2 files changed, 35 insertions(+), 27 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 95c74baae2..cf081473a3 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,28 +5,32 @@ require 'action_controller'
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-# reference the global "app" instance, created on demand. To recreate the
-# instance, pass a non-false value as the parameter.
-def app(create=false)
-  @app_integration_instance = nil if create
-  @app_integration_instance ||= new_session do |sess|
-    sess.host! "www.example.com"
-  end
-end
+module IRB
+  module ExtendCommandBundle
+    # reference the global "app" instance, created on demand. To recreate the
+    # instance, pass a non-false value as the parameter.
+    def app(create=false)
+      @app_integration_instance = nil if create
+      @app_integration_instance ||= new_session do |sess|
+        sess.host! "www.example.com"
+      end
+    end
 
-# create a new session. If a block is given, the new session will be yielded
-# to the block before being returned.
-def new_session
-  app = Rails.application
-  session = ActionDispatch::Integration::Session.new(app)
-  yield session if block_given?
-  session
-end
+    # create a new session. If a block is given, the new session will be yielded
+    # to the block before being returned.
+    def new_session
+      app = Rails.application
+      session = ActionDispatch::Integration::Session.new(app)
+      yield session if block_given?
+      session
+    end
 
-# reloads the environment
-def reload!(print=true)
-  puts "Reloading..." if print
-  ActionDispatch::Reloader.cleanup!
-  ActionDispatch::Reloader.prepare!
-  true
+    # reloads the environment
+    def reload!(print=true)
+      puts "Reloading..." if print
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+      true
+    end
+  end
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 212fc6125a..070d3c2bbf 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module IRB
+  module ExtendCommandBundle
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end
-- 
cgit v1.2.3


From 44e751fdd4bcb60bba667ec641a4febbf1133e0f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 5 Nov 2011 19:26:23 -0500
Subject: Add arel to Gemfile on apps generated in edge Rails

---
 railties/lib/rails/generators/app_base.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 10fdfdd8a9..0a79d6e86e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -139,11 +139,13 @@ module Rails
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
             gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
             gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
-- 
cgit v1.2.3


From 42cf5eba260f97e6da0ef66b954d95b9e7c2b102 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Nov 2011 14:31:12 +0900
Subject: Remove redundant blank line at the bottom

---
 railties/lib/rails/generators/rails/controller/templates/controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb
index 8f5f78556f..52243f4a2f 100644
--- a/railties/lib/rails/generators/rails/controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb
@@ -3,7 +3,7 @@ class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>
   def <%= action %>
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 end
 <% end -%>
-- 
cgit v1.2.3


From b53f77ec99ee179d66cca5efa9b68a659b161841 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 8 Nov 2011 12:56:51 +0530
Subject: CHANGELOG to CHANGELOG.md

---
 railties/lib/rails/tasks/documentation.rake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index ca8875ad9b..2072a2b947 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -66,31 +66,31 @@ namespace :doc do
     rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|
         rdoc.rdoc_files.include("#{actionmailer}/#{file}")
       end
     end
 
     gem_path('actionpack') do |actionpack|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{actionpack}/#{file}")
       end
     end
 
     gem_path('activemodel') do |activemodel|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/active_model/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activemodel}/#{file}")
       end
     end
 
     gem_path('activerecord') do |activerecord|
-      %w(README.rdoc CHANGELOG lib/active_record/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_record/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activerecord}/#{file}")
       end
     end
 
     gem_path('activeresource') do |activeresource|
-      %w(README.rdoc CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_resource.rb lib/active_resource/*).each do |file|
         rdoc.rdoc_files.include("#{activeresource}/#{file}")
       end
     end
-- 
cgit v1.2.3


From fe67501e62429a8d9c666837740cf9c1de1d4f87 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 8 Nov 2011 14:10:44 +0530
Subject: Should be checking if file exists or not.

I found this bug when running rake test:uncommitted
on a newly generated rails app which don't have
test file for application_controller.
Can see detail here #3461
---
 railties/lib/rails/test_unit/testing.rake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 3d87529ad4..8bcceb9b2c 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -121,10 +121,16 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
-      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      unit_tests = models.map do |model|
+        file = "test/unit/#{File.basename(model, '.rb')}_test.rb"
+        file if File.exist?(file)
+      end
+      functional_tests = controllers.map do |controller|
+        file = "test/functional/#{File.basename(controller, '.rb')}_test.rb"
+        file if File.exist?(file)
+      end
 
-      unit_tests.uniq + functional_tests.uniq
+      (unit_tests.uniq + functional_tests.uniq).compact
     end
 
     t.libs << 'test'
-- 
cgit v1.2.3


From 5f826ea26f048df941325427c841608ced86f7a1 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 9 Nov 2011 09:46:06 +0530
Subject: Refactor test:uncommitted task.

Thanks to @sobrinho (Gabriel Sobrinho)
---
 railties/lib/rails/test_unit/testing.rake | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 8bcceb9b2c..52d92cdd96 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -121,16 +121,9 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests = models.map do |model|
-        file = "test/unit/#{File.basename(model, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-      functional_tests = controllers.map do |controller|
-        file = "test/functional/#{File.basename(controller, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-
-      (unit_tests.uniq + functional_tests.uniq).compact
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
 
     t.libs << 'test'
-- 
cgit v1.2.3


From f642724f27af5b16290f56795563eaa194e20301 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 9 Nov 2011 09:59:17 +0530
Subject: CHANGELOG => CHANGELOG.md

I missed these in previous commit
---
 railties/lib/rails/tasks/documentation.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 2072a2b947..1e7da5ccae 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -96,13 +96,13 @@ namespace :doc do
     end
 
     gem_path('activesupport') do |activesupport|
-      %w(README.rdoc CHANGELOG lib/active_support/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_support/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
     end
 
     gem_path('railties') do |railties|
-      %w(README.rdoc CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
         rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
-- 
cgit v1.2.3


From 6d09f275c6e3224a8ea9a738512c90ee5334e20d Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 9 Nov 2011 15:42:19 +0900
Subject: Modulize Rails console methods so that other console libraries such
 as Pry can include these methods

---
 railties/lib/rails/application.rb     | 2 ++
 railties/lib/rails/console/app.rb     | 4 ++--
 railties/lib/rails/console/helpers.rb | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..e8b160448b 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,6 +205,8 @@ module Rails
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
     end
   end
 end
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index cf081473a3..23d57379ba 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,8 +5,8 @@ require 'action_controller'
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     # reference the global "app" instance, created on demand. To recreate the
     # instance, pass a non-false value as the parameter.
     def app(create=false)
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 070d3c2bbf..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,5 +1,5 @@
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     def helper
       @helper ||= ApplicationController.helpers
     end
-- 
cgit v1.2.3


From a658fd2ffa2fd2019696ddd10b12aa5490b1668e Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 10 Nov 2011 06:47:35 +0900
Subject: Extend IRB right before starting IRB to remove dependency on IRB from
 Rails::Application

---
 railties/lib/rails/application.rb      | 2 --
 railties/lib/rails/commands/console.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index e8b160448b..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,8 +205,6 @@ module Rails
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
-
-      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
     end
   end
 end
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 32e361d421..7733a8f116 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -42,6 +42,8 @@ module Rails
       else
         puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
       IRB.start
     end
   end
-- 
cgit v1.2.3


From 49349089ad38b403bf3f395ebf8fbc44cd232b49 Mon Sep 17 00:00:00 2001
From: Tyler Coville <tyler@tylercoville.com>
Date: Wed, 9 Nov 2011 23:22:26 -0800
Subject: Fixed error with 'rails generate new plugin' where the .gitignore was
 not properly generated if --dummy-path was used and added test case

---
 .../lib/rails/generators/rails/plugin_new/plugin_new_generator.rb   | 2 +-
 railties/lib/rails/generators/rails/plugin_new/templates/gitignore  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 4baa2110e7..f5c8ccf940 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -39,7 +39,7 @@ module Rails
     end
 
     def gitignore
-      copy_file "gitignore", ".gitignore"
+      template "gitignore", ".gitignore"
     end
 
     def lib
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
index 1463de6dfb..92bd3c614b 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -1,6 +1,6 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
\ No newline at end of file
+<%= dummy_path %>/db/*.sqlite3
+<%= dummy_path %>/log/*.log
+<%= dummy_path %>/tmp/
\ No newline at end of file
-- 
cgit v1.2.3


From 9ce5d5155bc394fbd076203b14fbd8d83d10caf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Wn=C4=99trzak?= <w.wnetrzak@gmail.com>
Date: Thu, 10 Nov 2011 18:52:39 +0100
Subject: fixed example code indentation

---
 railties/lib/rails/engine.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1c9627734e..d652c6b7fe 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -296,16 +296,16 @@ module Rails
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::SharedEngineHelper
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::SharedEngineHelper
+  #   end
   #
   # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
   # instance:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::Engine.helpers
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::Engine.helpers
+  #   end
   #
   # It will include all of the helpers from engine's directory. Take into account that this does
   # not include helpers defined in controllers with helper_method or other similar solutions,
-- 
cgit v1.2.3


From 49cd6a0ff7a3f5b0e85707961c952bdc3b0a178f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 14 Nov 2011 07:07:38 -0500
Subject: Added therubyrhino to default Gemfile under JRuby

---
 railties/lib/rails/generators/app_base.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 0a79d6e86e..3fbde0d989 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -199,6 +199,7 @@ module Rails
           group :assets do
             gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
             gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+            #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE
-- 
cgit v1.2.3


From 21c5a0a104bf04e3e7b63aa5f0104f1c666655c3 Mon Sep 17 00:00:00 2001
From: Daniel Dyba <daniel.dyba@gmail.com>
Date: Sat, 16 Jul 2011 16:54:03 -0700
Subject: Changed Commands module to RailsCommands.

This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
---
 railties/lib/rails/commands/plugin.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 4df849447d..aa4551c806 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,7 +274,7 @@ end
 
 # load default environment and parse arguments
 require 'optparse'
-module Commands
+module RailsCommands
   class Plugin
     attr_reader :environment, :script_name
     def initialize
@@ -327,7 +327,7 @@ module Commands
 
       command = general.shift
       if command =~ /^(install|remove)$/
-        command = Commands.const_get(command.capitalize).new(self)
+        command = RailsCommands.const_get(command.capitalize).new(self)
         command.parse!(sub)
       else
         puts "Unknown command: #{command}" unless command.blank?
@@ -539,4 +539,4 @@ class RecursiveHTTPFetcher
   end
 end
 
-Commands::Plugin.parse!
+RailsCommands::Plugin.parse!
-- 
cgit v1.2.3


From 325abe9fbad58b6a0e119a678039b195247a57bc Mon Sep 17 00:00:00 2001
From: Daniel Dyba <daniel.dyba@gmail.com>
Date: Sun, 17 Jul 2011 23:09:51 -0700
Subject: Substituted RailsCommands for Rails::Commands

---
 railties/lib/rails/commands/plugin.rb | 320 +++++++++++++++++-----------------
 1 file changed, 161 insertions(+), 159 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index aa4551c806..c99a2e6685 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,198 +274,200 @@ end
 
 # load default environment and parse arguments
 require 'optparse'
-module RailsCommands
-  class Plugin
-    attr_reader :environment, :script_name
-    def initialize
-      @environment = RailsEnvironment.default
-      @rails_root = RailsEnvironment.default.root
-      @script_name = File.basename($0)
-    end
+module Rails
+  module Commands
+    class Plugin
+      attr_reader :environment, :script_name
+      def initialize
+        @environment = RailsEnvironment.default
+        @rails_root = RailsEnvironment.default.root
+        @script_name = File.basename($0)
+      end
 
-    def environment=(value)
-      @environment = value
-      RailsEnvironment.default = value
-    end
+      def environment=(value)
+        @environment = value
+        RailsEnvironment.default = value
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: plugin [OPTIONS] command"
-        o.define_head "Rails plugin manager."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: plugin [OPTIONS] command"
+          o.define_head "Rails plugin manager."
 
-        o.separator ""
-        o.separator "GENERAL OPTIONS"
+          o.separator ""
+          o.separator "GENERAL OPTIONS"
 
-        o.on("-r", "--root=DIR", String,
-             "Set an explicit rails app directory.",
-             "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
+          o.on("-r", "--root=DIR", String,
+               "Set an explicit rails app directory.",
+               "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
 
-        o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
-        o.on("-h", "--help", "Show this help message.") { puts o; exit }
+          o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
+          o.on("-h", "--help", "Show this help message.") { puts o; exit }
 
-        o.separator ""
-        o.separator "COMMANDS"
+          o.separator ""
+          o.separator "COMMANDS"
 
-        o.separator "  install    Install plugin(s) from known repositories or URLs."
-        o.separator "  remove     Uninstall plugins."
+          o.separator "  install    Install plugin(s) from known repositories or URLs."
+          o.separator "  remove     Uninstall plugins."
 
-        o.separator ""
-        o.separator "EXAMPLES"
-        o.separator "  Install a plugin from a subversion URL:"
-        o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
-        o.separator "  Install a plugin from a git URL:"
-        o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
-        o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
-        o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+          o.separator ""
+          o.separator "EXAMPLES"
+          o.separator "  Install a plugin from a subversion URL:"
+          o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
+          o.separator "  Install a plugin from a git URL:"
+          o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
+          o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
+          o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+        end
       end
-    end
 
-    def parse!(args=ARGV)
-      general, sub = split_args(args)
-      options.parse!(general)
+      def parse!(args=ARGV)
+        general, sub = split_args(args)
+        options.parse!(general)
 
-      command = general.shift
-      if command =~ /^(install|remove)$/
-        command = RailsCommands.const_get(command.capitalize).new(self)
-        command.parse!(sub)
-      else
-        puts "Unknown command: #{command}" unless command.blank?
-        puts options
-        exit 1
+        command = general.shift
+        if command =~ /^(install|remove)$/
+          command = Commands.const_get(command.capitalize).new(self)
+          command.parse!(sub)
+        else
+          puts "Unknown command: #{command}" unless command.blank?
+          puts options
+          exit 1
+        end
       end
-    end
 
-    def split_args(args)
-      left = []
-      left << args.shift while args[0] and args[0] =~ /^-/
-      left << args.shift if args[0]
-      [left, args]
-    end
-
-    def self.parse!(args=ARGV)
-      Plugin.new.parse!(args)
-    end
-  end
+      def split_args(args)
+        left = []
+        left << args.shift while args[0] and args[0] =~ /^-/
+        left << args.shift if args[0]
+        [left, args]
+      end
 
-  class Install
-    def initialize(base_command)
-      @base_command = base_command
-      @method = :http
-      @options = { :quiet => false, :revision => nil, :force => false }
+      def self.parse!(args=ARGV)
+        Plugin.new.parse!(args)
+      end
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
-        o.define_head "Install one or more plugins."
-        o.separator   ""
-        o.separator   "Options:"
-        o.on(         "-x", "--externals",
-                      "Use svn:externals to grab the plugin.",
-                      "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
-        o.on(         "-o", "--checkout",
-                      "Use svn checkout to grab the plugin.",
-                      "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
-        o.on(         "-e", "--export",
-                      "Use svn export to grab the plugin.",
-                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
-        o.on(         "-q", "--quiet",
-                      "Suppresses the output from installation.",
-                      "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
-        o.on(         "-r REVISION", "--revision REVISION",
-                      "Checks out the given revision from subversion or git.",
-                      "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
-        o.on(         "-f", "--force",
-                      "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
-        o.separator   ""
-        o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
-        o.separator   "a plugin repository."
+    class Install
+      def initialize(base_command)
+        @base_command = base_command
+        @method = :http
+        @options = { :quiet => false, :revision => nil, :force => false }
       end
-    end
 
-    def determine_install_method
-      best = @base_command.environment.best_install_method
-      @method = :http if best == :http and @method == :export
-      case
-      when (best == :http and @method != :http)
-        msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
-      when (best == :export and (@method != :export and @method != :http))
-        msg = "Cannot install using #{@method} because this project is not under subversion."
-      when (best != :externals and @method == :externals)
-        msg = "Cannot install using externals because vendor/plugins is not under subversion."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
+          o.define_head "Install one or more plugins."
+          o.separator   ""
+          o.separator   "Options:"
+          o.on(         "-x", "--externals",
+                        "Use svn:externals to grab the plugin.",
+                        "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
+          o.on(         "-o", "--checkout",
+                        "Use svn checkout to grab the plugin.",
+                        "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
+          o.on(         "-e", "--export",
+                        "Use svn export to grab the plugin.",
+                        "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
+          o.on(         "-q", "--quiet",
+                        "Suppresses the output from installation.",
+                        "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
+          o.on(         "-r REVISION", "--revision REVISION",
+                        "Checks out the given revision from subversion or git.",
+                        "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
+          o.on(         "-f", "--force",
+                        "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
+          o.separator   ""
+          o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
+          o.separator   "a plugin repository."
+        end
       end
-      if msg
-        puts msg
-        exit 1
+
+      def determine_install_method
+        best = @base_command.environment.best_install_method
+        @method = :http if best == :http and @method == :export
+        case
+        when (best == :http and @method != :http)
+          msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
+        when (best == :export and (@method != :export and @method != :http))
+          msg = "Cannot install using #{@method} because this project is not under subversion."
+        when (best != :externals and @method == :externals)
+          msg = "Cannot install using externals because vendor/plugins is not under subversion."
+        end
+        if msg
+          puts msg
+          exit 1
+        end
+        @method
       end
-      @method
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        environment = @base_command.environment
+        install_method = determine_install_method
+        puts "Plugins will be installed using #{install_method}" if $verbose
+        args.each do |name|
+          ::Plugin.find(name).install(install_method, @options)
+        end
+      rescue StandardError => e
+        puts "Plugin not found: #{args.inspect}"
+        puts e.inspect if $verbose
         exit 1
       end
-      environment = @base_command.environment
-      install_method = determine_install_method
-      puts "Plugins will be installed using #{install_method}" if $verbose
-      args.each do |name|
-        ::Plugin.find(name).install(install_method, @options)
-      end
-    rescue StandardError => e
-      puts "Plugin not found: #{args.inspect}"
-      puts e.inspect if $verbose
-      exit 1
-    end
-  end
-
-  class Remove
-    def initialize(base_command)
-      @base_command = base_command
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
-        o.define_head "Remove plugins."
+    class Remove
+      def initialize(base_command)
+        @base_command = base_command
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
-        exit 1
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
+          o.define_head "Remove plugins."
+        end
       end
-      root = @base_command.environment.root
-      args.each do |name|
-        ::Plugin.new(name).uninstall
+
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        root = @base_command.environment.root
+        args.each do |name|
+          ::Plugin.new(name).uninstall
+        end
       end
     end
-  end
 
-  class Info
-    def initialize(base_command)
-      @base_command = base_command
-    end
+    class Info
+      def initialize(base_command)
+        @base_command = base_command
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
-        o.define_head "Shows plugin info at {url}/about.yml."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
+          o.define_head "Shows plugin info at {url}/about.yml."
+        end
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      args.each do |name|
-        puts ::Plugin.find(name).info
-        puts
+      def parse!(args)
+        options.parse!(args)
+        args.each do |name|
+          puts ::Plugin.find(name).info
+          puts
+        end
       end
     end
   end
@@ -539,4 +541,4 @@ class RecursiveHTTPFetcher
   end
 end
 
-RailsCommands::Plugin.parse!
+Rails::Commands::Plugin.parse!
-- 
cgit v1.2.3


From 0af93089deaf6dc9428c0f2f7a376cdb6f81daee Mon Sep 17 00:00:00 2001
From: Alex Tambellini <atambellini@gmail.com>
Date: Thu, 17 Nov 2011 09:44:17 -0500
Subject: Move schema_format :sql config setting from test.rb to application.rb

I've moved the schema_format :sql config setting to application.rb because you would
never enable this only for the test environment. If you use database constraints
or database specific data types you would want all of your environments to use them.
---
 .../lib/rails/generators/rails/app/templates/config/application.rb   | 5 +++++
 .../generators/rails/app/templates/config/environments/test.rb.tt    | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 13fbe9e526..40fd843b1b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -49,6 +49,11 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
 <% unless options.skip_sprockets? -%>
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..37a8b81dad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -29,11 +29,6 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   <%- unless options.skip_active_record? -%>
   # Raise exception on mass assignment protection for ActiveRecord models
   config.active_record.mass_assignment_sanitizer = :strict
-- 
cgit v1.2.3


From 39d2251d8a3e50bf004b6361e0079679466b2280 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Sat, 19 Nov 2011 19:03:44 +0200
Subject: fix rails plugin new CamelCasedName bug

refs #3684
---
 .../rails/plugin_new/plugin_new_generator.rb         | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index f5c8ccf940..ff523fc26f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -246,8 +246,20 @@ task :default => :test
         "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
+      def original_name
+        @original_name ||= File.basename(destination_root)
+      end
+
       def name
-        @name ||= File.basename(destination_root)
+        unless @name
+          # same as ActiveSupport::Inflector#underscore except not replacing '-'
+          @name = original_name.dup
+          @name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          @name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          @name.downcase!
+        end
+
+        @name
       end
 
       def camelized
@@ -256,11 +268,11 @@ task :default => :test
 
       def valid_const?
         if camelized =~ /^\d/
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not start with numbers."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(name)
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
+          raise Error, "Invalid plugin name #{original_name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 
-- 
cgit v1.2.3


From c220b4d833fcefb4f60fd021875c05e07dfff77d Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Sat, 19 Nov 2011 21:51:37 +0300
Subject: fix warning about instance variable in plugin generator

---
 .../generators/rails/plugin_new/plugin_new_generator.rb    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index ff523fc26f..cd7d51e628 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -251,15 +251,15 @@ task :default => :test
       end
 
       def name
-        unless @name
+        @name ||= begin
           # same as ActiveSupport::Inflector#underscore except not replacing '-'
-          @name = original_name.dup
-          @name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-          @name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-          @name.downcase!
-        end
+          underscored = original_name.dup
+          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          underscored.downcase!
 
-        @name
+          underscored
+        end
       end
 
       def camelized
-- 
cgit v1.2.3


From 4c872c017b47120b95eb2acf1d3401bd937b0647 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 22 Nov 2011 00:05:46 +0530
Subject: Remove the -h option to dbconsole which is the shorter form of
 --header

This is done since the -h option to dbconsole hides the conventional
-h for help and forces users to use --help to see the usage options for
dbconsole.
---
 railties/lib/rails/commands/dbconsole.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index b0ba76217a..4b0acc9d88 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -33,7 +33,7 @@ module Rails
             options['mode'] = mode
         end
 
-        opt.on("-h", "--header") do |h|
+        opt.on("--header") do |h|
           options['header'] = h
         end
 
-- 
cgit v1.2.3


From a9e8cf78fda696738f63e726796f6232c3751603 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Mon, 21 Nov 2011 20:13:54 +0300
Subject: add ActionController::Metal#show_detailed_exceptions?

---
 railties/lib/rails/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..817fa39cab 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -166,7 +166,7 @@ module Rails
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
         middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
+        middleware.use ::ActionDispatch::ShowExceptions
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         if config.action_dispatch.x_sendfile_header.present?
           middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
-- 
cgit v1.2.3


From 05e02deb686fc21f99c2d1dcf3abc987796e0e19 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Tue, 22 Nov 2011 15:16:23 -0500
Subject: Make explicit the default media when calling stylesheet_tag and
 change the default generators.

---
 .../rails/app/templates/app/views/layouts/application.html.erb.tt       | 2 +-
 .../templates/app/views/layouts/%name%/application.html.erb.tt          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c63d1b6ac5..bba96a7431 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "application" %>
+  <%%= stylesheet_link_tag    "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
index 01550dec2f..bd983fb90f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= stylesheet_link_tag    "<%= name %>/application", :media => "all" %>
   <%%= javascript_include_tag "<%= name %>/application" %>
   <%%= csrf_meta_tags %>
 </head>
-- 
cgit v1.2.3


From d78a7026fcd5eb0cd91e3da2a125ddfcf53e7a7a Mon Sep 17 00:00:00 2001
From: Sergey Parizhskiy <parizhskiy@gmail.com>
Date: Wed, 23 Nov 2011 14:10:30 +0200
Subject: improved code stats calculation, check on multiline comments and
 rewrite regexps according to a class naming convention

---
 railties/lib/rails/code_statistics.rb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index e6822b75b7..435ea83ad8 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -38,11 +38,22 @@ class CodeStatistics #:nodoc:
         next unless file_name =~ pattern
 
         f = File.open(directory + "/" + file_name)
-
+        comment_started = false
         while line = f.gets
           stats["lines"]     += 1
-          stats["classes"]   += 1 if line =~ /class [A-Z]/
-          stats["methods"]   += 1 if line =~ /def [a-z]/
+          if(comment_started)
+            if line =~ /^=end/
+              comment_started = false
+            end
+            next
+          else
+            if line =~ /^=begin/
+              comment_started = true
+              next
+            end
+          end
+          stats["classes"]   += 1 if line =~ /^\s*class\s+[_A-Z]/
+          stats["methods"]   += 1 if line =~ /^\s*def\s+[_a-z]/
           stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
         end
       end
-- 
cgit v1.2.3


From fd86a1b6b068df87164d5763bdcd4a323a1e76f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 19:06:45 +0000
Subject: Rely on a public contract between railties instead of accessing
 railtie methods directly.

---
 railties/lib/rails/application.rb |  4 ++++
 railties/lib/rails/engine.rb      | 43 +++++++++++++++++++++++----------------
 railties/lib/rails/railtie.rb     |  2 +-
 3 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 817fa39cab..0b72a7ed84 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -141,6 +141,10 @@ module Rails
       self
     end
 
+    def helpers_paths
+      config.helpers_paths
+    end
+
   protected
 
     alias :build_middleware_stack :app
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index d652c6b7fe..335a0fb1b5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -371,20 +371,28 @@ module Rails
         self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
-        unless mod.respond_to?(:_railtie)
-          name = engine_name
-          _railtie = self
+        unless mod.respond_to?(:railtie_namespace)
+          name, railtie = engine_name, self
+
           mod.singleton_class.instance_eval do
-            define_method(:_railtie) do
-              _railtie
-            end
+            define_method(:railtie_namespace) { railtie }
 
             unless mod.respond_to?(:table_name_prefix)
-              define_method(:table_name_prefix) do
-                "#{name}_"
-              end
+              define_method(:table_name_prefix) { "#{name}_" }
+            end
+
+            unless mod.respond_to?(:use_relative_model_naming?)
+              class_eval "def use_relative_model_naming?; true; end", __FILE__, __LINE__
+            end
+
+            unless mod.respond_to?(:railtie_helpers_paths)
+              define_method(:railtie_helpers_paths) { railtie.helpers_paths }
+            end
+
+            unless mod.respond_to?(:railtie_routes_url_helpers)
+              define_method(:railtie_routes_url_helpers) { railtie.routes_url_helpers }
             end
-         end
+          end
         end
       end
 
@@ -429,13 +437,6 @@ module Rails
     def helpers
       @helpers ||= begin
         helpers = Module.new
-
-        helpers_paths = if config.respond_to?(:helpers_paths)
-          config.helpers_paths
-        else
-          paths["app/helpers"].existent
-        end
-
         all = ActionController::Base.all_helpers_from_path(helpers_paths)
         ActionController::Base.modules_for_helpers(all).each do |mod|
           helpers.send(:include, mod)
@@ -444,6 +445,14 @@ module Rails
       end
     end
 
+    def helpers_paths
+      paths["app/helpers"].existent
+    end
+
+    def routes_url_helpers
+      routes.url_helpers
+    end
+
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index e8fb1f3d98..f0991b99af 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -196,7 +196,7 @@ module Rails
     end
 
     def railtie_namespace
-      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:_railtie) }
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
   end
 end
-- 
cgit v1.2.3


From 40b19e063592fc30705f17aafe6a458e7b622ff2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 22 Nov 2011 23:26:27 +0100
Subject: Allow to change engine's loading priority with config.railties_order=

---
 railties/lib/rails/application.rb               | 22 ++++++++++++++++++++++
 railties/lib/rails/application/configuration.rb |  5 +++--
 railties/lib/rails/engine.rb                    | 24 ++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0b72a7ed84..847445d29f 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -127,6 +127,28 @@ module Rails
       })
     end
 
+    def ordered_railties
+      @ordered_railties ||= begin
+        order = config.railties_order.map do |railtie|
+          if railtie == :main_app
+            self
+          elsif railtie.respond_to?(:instance)
+            railtie.instance
+          else
+            railtie
+          end
+        end
+
+        all = (railties.all - order)
+        all.push(self)   unless all.include?(self)
+        order.push(:all) unless order.include?(:all)
+
+        index = order.index(:all)
+        order[index] = all
+        order.reverse.flatten
+      end
+    end
+
     def initializers
       Bootstrap.initializers_for(self) +
       super +
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 8f5b28faf8..e95b0f5495 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,8 +10,8 @@ module Rails
                     :dependency_loading, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
-                    :ssl_options, :static_cache_control, :session_options, 
-                    :time_zone, :whiny_nils
+                    :ssl_options, :static_cache_control, :session_options,
+                    :time_zone, :whiny_nils, :railties_order
 
       attr_writer :log_level
       attr_reader :encoding
@@ -35,6 +35,7 @@ module Rails
         @middleware                  = app_middleware
         @generators                  = app_generators
         @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
+        @railties_order              = [:all]
 
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled                  = false
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 335a0fb1b5..5c1af99fe2 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -330,6 +330,17 @@ module Rails
   #
   #   MyEngine::Engine.load_seed
   #
+  # == Loading priority
+  #
+  # In order to change engine's priority you can use config.railties_order in main application.
+  # It will affect the priority of loading views, helpers, assets and all the other files
+  # related to engine or application.
+  #
+  # Example:
+  #
+  #   # load Blog::Engine with highest priority, followed by application and other railties
+  #   config.railties_order = [Blog::Engine, :main_app, :all]
+  #
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
     autoload :Railties,      "rails/engine/railties"
@@ -480,10 +491,19 @@ module Rails
       @routes
     end
 
+    def ordered_railties
+      railties.all + [self]
+    end
+
     def initializers
       initializers = []
-      railties.all { |r| initializers += r.initializers }
-      initializers += super
+      ordered_railties.each do |r|
+        if r == self
+          initializers += super
+        else
+          initializers += r.initializers
+        end
+      end
       initializers
     end
 
-- 
cgit v1.2.3


From 0cd3bf84068dd2b2d0bbb26062f2cdc7093a1b04 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 24 Nov 2011 01:45:50 +0100
Subject: Allow to display engine's routes when running `rake routes
 ENGINES=true`

---
 railties/lib/rails/application/route_inspector.rb | 37 +++++++++++++++++++++--
 railties/lib/rails/tasks/routes.rake              |  2 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 8252f21aa7..8da7de2584 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -4,12 +4,23 @@ module Rails
     # This class is just used for displaying route information when someone
     # executes `rake routes`.  People should not use this class.
     class RouteInspector # :nodoc:
+      def initialize
+        @engines = ActiveSupport::OrderedHash.new
+      end
+
       def format all_routes, filter = nil
         if filter
           all_routes = all_routes.select{ |route| route.defaults[:controller] == filter }
         end
 
-        routes = all_routes.collect do |route|
+        routes = collect_routes(all_routes)
+
+        formatted_routes(routes) +
+          formatted_routes_for_engines
+      end
+
+      def collect_routes(routes)
+        routes = routes.collect do |route|
           route_reqs = route.requirements
 
           rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
@@ -25,12 +36,32 @@ module Rails
 
           verb = route.verb.source.gsub(/[$^]/, '')
 
-          {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
+          collect_engine_routes(reqs, rack_app)
+
+          {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs }
         end
 
         # Skip the route if it's internal info route
-        routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+        routes.reject { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+      end
+
+      def collect_engine_routes(name, rack_app)
+        return unless rack_app && ENV["ENGINES"] && rack_app.respond_to?(:routes)
+        return if @engines[name]
+
+        routes = rack_app.routes
+        if routes.is_a?(ActionDispatch::Routing::RouteSet)
+          @engines[name] = collect_routes(routes.routes)
+        end
+      end
+
+      def formatted_routes_for_engines
+        @engines.map do |name, routes|
+          ["\nRoutes for #{name}:"] + formatted_routes(routes)
+        end.flatten
+      end
 
+      def formatted_routes(routes)
         name_width = routes.map{ |r| r[:name].length }.max
         verb_width = routes.map{ |r| r[:verb].length }.max
         path_width = routes.map{ |r| r[:path].length }.max
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 7dc54144da..df72baef67 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,4 +1,4 @@
-desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
+desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x. Include engine\'s routes with ENGINES=true'
 task :routes => :environment do
   Rails.application.reload_routes!
   all_routes = Rails.application.routes.routes
-- 
cgit v1.2.3


From ebb8ea22f30dc029f4a868a550828443b160f639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Nov 2011 09:13:19 +0000
Subject: Add generators for serializers.

---
 .../lib/rails/generators/rails/serializer/USAGE    |  9 +++++
 .../rails/serializer/serializer_generator.rb       | 39 ++++++++++++++++++++++
 .../rails/serializer/templates/serializer.rb       |  9 +++++
 .../test_unit/serializer/serializer_generator.rb   | 13 ++++++++
 .../test_unit/serializer/templates/unit_test.rb    |  9 +++++
 5 files changed, 79 insertions(+)
 create mode 100644 railties/lib/rails/generators/rails/serializer/USAGE
 create mode 100644 railties/lib/rails/generators/rails/serializer/serializer_generator.rb
 create mode 100644 railties/lib/rails/generators/rails/serializer/templates/serializer.rb
 create mode 100644 railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
 create mode 100644 railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/serializer/USAGE b/railties/lib/rails/generators/rails/serializer/USAGE
new file mode 100644
index 0000000000..a49f7ea1fb
--- /dev/null
+++ b/railties/lib/rails/generators/rails/serializer/USAGE
@@ -0,0 +1,9 @@
+Description:
+    Generates a serializer for the given resource with tests.
+
+Example:
+    `rails generate serializer Account name created_at`
+
+    For TestUnit it creates:
+        Serializer:  app/serializers/account_serializer.rb
+        TestUnit:    test/unit/account_serializer_test.rb
diff --git a/railties/lib/rails/generators/rails/serializer/serializer_generator.rb b/railties/lib/rails/generators/rails/serializer/serializer_generator.rb
new file mode 100644
index 0000000000..2118906227
--- /dev/null
+++ b/railties/lib/rails/generators/rails/serializer/serializer_generator.rb
@@ -0,0 +1,39 @@
+module Rails
+  module Generators
+    class SerializerGenerator < NamedBase
+      check_class_collision :suffix => "Serializer"
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      class_option :parent, :type => :string, :desc => "The parent class for the generated serializer"
+
+      def create_serializer_file
+        template 'serializer.rb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
+      end
+
+      hook_for :test_framework
+
+      private
+
+      def attributes_names
+        attributes.select { |attr| !attr.reference? }.map { |a| a.name.to_sym }
+      end
+
+      def association_names
+        attributes.select { |attr| attr.reference? }.map { |a| a.name.to_sym }
+      end
+
+      def parent_class_name
+        if options[:parent]
+          options[:parent]
+        elsif (n = Rails::Generators.namespace) && n.const_defined?(:ApplicationSerializer)
+          "ApplicationSerializer"
+        elsif Object.const_defined?(:ApplicationSerializer)
+          "ApplicationSerializer"
+        else
+          "ActiveModel::Serializer"
+        end
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/rails/serializer/templates/serializer.rb b/railties/lib/rails/generators/rails/serializer/templates/serializer.rb
new file mode 100644
index 0000000000..30c058c7e9
--- /dev/null
+++ b/railties/lib/rails/generators/rails/serializer/templates/serializer.rb
@@ -0,0 +1,9 @@
+<% module_namespacing do -%>
+class <%= class_name %>Serializer < <%= parent_class_name %>
+<% if attributes.any? -%>  attributes <%= attributes_names.map(&:inspect).join(", ") %>
+<% end -%>
+<% association_names.each do |attribute| -%>
+  has_one :<%= attribute %>
+<% end -%>
+end
+<% end -%>
\ No newline at end of file
diff --git a/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb b/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
new file mode 100644
index 0000000000..533c032c3b
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
@@ -0,0 +1,13 @@
+require 'rails/generators/test_unit'
+
+module TestUnit
+  module Generators
+    class SerializerGenerator < Base
+      check_class_collision :suffix => "SerializerTest"
+
+      def create_test_files
+        template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_serializer_test.rb")
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
new file mode 100644
index 0000000000..0b1bbdcaa5
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= class_name %>SerializerTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+<% end -%>
-- 
cgit v1.2.3


From 6d9f9b3b05f6ea55aad9853888912bcca4d81c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Nov 2011 09:17:32 +0000
Subject: Add a hook for serializers in the scaffold generator (off for now).

---
 railties/lib/rails/generators.rb                                   | 4 +++-
 railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 27f8d13ce8..f1ca9080ff 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -33,7 +33,8 @@ module Rails
         :stylesheets => '-y',
         :stylesheet_engine => '-se',
         :template_engine => '-e',
-        :test_framework => '-t'
+        :test_framework => '-t',
+        :serializer => '-z'
       },
 
       :test_unit => {
@@ -58,6 +59,7 @@ module Rails
         :performance_tool => nil,
         :resource_controller => :controller,
         :scaffold_controller => :scaffold_controller,
+        :serializer => false,
         :stylesheets => true,
         :stylesheet_engine => :css,
         :test_framework => false,
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index 03a61a035e..7353a67c83 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -10,6 +10,7 @@ module Rails
       class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
 
       hook_for :scaffold_controller, :required => true
+      hook_for :serializer
 
       hook_for :assets do |assets|
         invoke assets, [controller_name]
-- 
cgit v1.2.3


From c8d7291b6b5736562b112007365317648ae2b790 Mon Sep 17 00:00:00 2001
From: ganesh <ganesh.dc@gmail.com>
Date: Fri, 25 Nov 2011 14:55:28 +0530
Subject: Added tests for #3751

---
 railties/lib/rails/generators/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index b26839644e..184cb2866b 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -68,7 +68,7 @@ module Rails
         end
 
         in_root do
-          str = "gem #{parts.join(", ")}\n"
+          str = "\ngem #{parts.join(", ")}\n"
           str = "  " + str if @in_group
           append_file "Gemfile", str, :verbose => false
         end
-- 
cgit v1.2.3


From cd9d28d6fdff6819dac3c6643fe882eb568b5a39 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Thu, 24 Nov 2011 22:37:48 +0300
Subject: middlewares should use logger from env

---
 railties/lib/rails/application.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 847445d29f..25ff74506a 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -123,7 +123,8 @@ module Rails
       @env_config ||= super.merge({
         "action_dispatch.parameter_filter" => config.filter_parameters,
         "action_dispatch.secret_token" => config.secret_token,
-        "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
+        "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
+        "action_dispatch.logger" => Rails.logger
       })
     end
 
-- 
cgit v1.2.3


From c9bb099318dd3bc293a6cb4672333147c1cce4b9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 25 Nov 2011 12:42:11 +0100
Subject: Display mounted engines in `rake routes` by default

---
 railties/lib/rails/application/route_inspector.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 8da7de2584..26652a8e5e 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -46,7 +46,7 @@ module Rails
       end
 
       def collect_engine_routes(name, rack_app)
-        return unless rack_app && ENV["ENGINES"] && rack_app.respond_to?(:routes)
+        return unless rack_app && rack_app.respond_to?(:routes)
         return if @engines[name]
 
         routes = rack_app.routes
-- 
cgit v1.2.3


From 8ff8fa5e5fd9a615f2c63f809a2747a55cd4da15 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 25 Nov 2011 12:54:39 +0100
Subject: I suck, forgot to also change rake's task description

---
 railties/lib/rails/tasks/routes.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index df72baef67..7dc54144da 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,4 +1,4 @@
-desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x. Include engine\'s routes with ENGINES=true'
+desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
   Rails.application.reload_routes!
   all_routes = Rails.application.routes.routes
-- 
cgit v1.2.3


From 95e9b5fbfd87b81bf2d2b16a6df6d9ddbfdb686d Mon Sep 17 00:00:00 2001
From: John Donahue <johnmdonahue@gmail.com>
Date: Fri, 25 Nov 2011 09:06:14 -0800
Subject: Updating newline fix to maintain existing linebreaks and indentation
 and test for b/eol on inserts

---
 railties/lib/rails/generators/actions.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 184cb2866b..ca93f9ef9d 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -68,8 +68,9 @@ module Rails
         end
 
         in_root do
-          str = "\ngem #{parts.join(", ")}\n"
+          str = "gem #{parts.join(", ")}"
           str = "  " + str if @in_group
+          str = "\n" + str
           append_file "Gemfile", str, :verbose => false
         end
       end
@@ -87,13 +88,13 @@ module Rails
         log :gemfile, "group #{name}"
 
         in_root do
-          append_file "Gemfile", "\ngroup #{name} do\n", :force => true
+          append_file "Gemfile", "\ngroup #{name} do", :force => true
 
           @in_group = true
           instance_eval(&block)
           @in_group = false
 
-          append_file "Gemfile", "end\n", :force => true
+          append_file "Gemfile", "\nend\n", :force => true
         end
       end
 
-- 
cgit v1.2.3


From 0a4035b12a6c59253cb60f9e3456513c6a6a9d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Nov 2011 19:29:39 +0000
Subject: Revert the serializers API as other alternatives are now also under
 discussion

---
 railties/lib/rails/generators.rb                   |  4 +--
 .../rails/scaffold/scaffold_generator.rb           |  1 -
 .../lib/rails/generators/rails/serializer/USAGE    |  9 -----
 .../rails/serializer/serializer_generator.rb       | 39 ----------------------
 .../rails/serializer/templates/serializer.rb       |  9 -----
 .../test_unit/serializer/serializer_generator.rb   | 13 --------
 .../test_unit/serializer/templates/unit_test.rb    |  9 -----
 7 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 railties/lib/rails/generators/rails/serializer/USAGE
 delete mode 100644 railties/lib/rails/generators/rails/serializer/serializer_generator.rb
 delete mode 100644 railties/lib/rails/generators/rails/serializer/templates/serializer.rb
 delete mode 100644 railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
 delete mode 100644 railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index f1ca9080ff..27f8d13ce8 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -33,8 +33,7 @@ module Rails
         :stylesheets => '-y',
         :stylesheet_engine => '-se',
         :template_engine => '-e',
-        :test_framework => '-t',
-        :serializer => '-z'
+        :test_framework => '-t'
       },
 
       :test_unit => {
@@ -59,7 +58,6 @@ module Rails
         :performance_tool => nil,
         :resource_controller => :controller,
         :scaffold_controller => :scaffold_controller,
-        :serializer => false,
         :stylesheets => true,
         :stylesheet_engine => :css,
         :test_framework => false,
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index 7353a67c83..03a61a035e 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -10,7 +10,6 @@ module Rails
       class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
 
       hook_for :scaffold_controller, :required => true
-      hook_for :serializer
 
       hook_for :assets do |assets|
         invoke assets, [controller_name]
diff --git a/railties/lib/rails/generators/rails/serializer/USAGE b/railties/lib/rails/generators/rails/serializer/USAGE
deleted file mode 100644
index a49f7ea1fb..0000000000
--- a/railties/lib/rails/generators/rails/serializer/USAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-Description:
-    Generates a serializer for the given resource with tests.
-
-Example:
-    `rails generate serializer Account name created_at`
-
-    For TestUnit it creates:
-        Serializer:  app/serializers/account_serializer.rb
-        TestUnit:    test/unit/account_serializer_test.rb
diff --git a/railties/lib/rails/generators/rails/serializer/serializer_generator.rb b/railties/lib/rails/generators/rails/serializer/serializer_generator.rb
deleted file mode 100644
index 2118906227..0000000000
--- a/railties/lib/rails/generators/rails/serializer/serializer_generator.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Rails
-  module Generators
-    class SerializerGenerator < NamedBase
-      check_class_collision :suffix => "Serializer"
-
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      class_option :parent, :type => :string, :desc => "The parent class for the generated serializer"
-
-      def create_serializer_file
-        template 'serializer.rb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
-      end
-
-      hook_for :test_framework
-
-      private
-
-      def attributes_names
-        attributes.select { |attr| !attr.reference? }.map { |a| a.name.to_sym }
-      end
-
-      def association_names
-        attributes.select { |attr| attr.reference? }.map { |a| a.name.to_sym }
-      end
-
-      def parent_class_name
-        if options[:parent]
-          options[:parent]
-        elsif (n = Rails::Generators.namespace) && n.const_defined?(:ApplicationSerializer)
-          "ApplicationSerializer"
-        elsif Object.const_defined?(:ApplicationSerializer)
-          "ApplicationSerializer"
-        else
-          "ActiveModel::Serializer"
-        end
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/generators/rails/serializer/templates/serializer.rb b/railties/lib/rails/generators/rails/serializer/templates/serializer.rb
deleted file mode 100644
index 30c058c7e9..0000000000
--- a/railties/lib/rails/generators/rails/serializer/templates/serializer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% module_namespacing do -%>
-class <%= class_name %>Serializer < <%= parent_class_name %>
-<% if attributes.any? -%>  attributes <%= attributes_names.map(&:inspect).join(", ") %>
-<% end -%>
-<% association_names.each do |attribute| -%>
-  has_one :<%= attribute %>
-<% end -%>
-end
-<% end -%>
\ No newline at end of file
diff --git a/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb b/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
deleted file mode 100644
index 533c032c3b..0000000000
--- a/railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rails/generators/test_unit'
-
-module TestUnit
-  module Generators
-    class SerializerGenerator < Base
-      check_class_collision :suffix => "SerializerTest"
-
-      def create_test_files
-        template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_serializer_test.rb")
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
deleted file mode 100644
index 0b1bbdcaa5..0000000000
--- a/railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-<% module_namespacing do -%>
-class <%= class_name %>SerializerTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
-<% end -%>
-- 
cgit v1.2.3


From 89d6db05d74ba8cb1d99aaa2166f02dd67a34a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ku=C5=BAma?= <qoobaa@gmail.com>
Date: Sat, 26 Nov 2011 17:11:17 +0100
Subject: allow using orm_instance without invoking orm_class first in
 generators

---
 railties/lib/rails/generators/resource_helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index b34bc4a524..f2195cb81a 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -73,7 +73,7 @@ module Rails
 
         # Initialize ORM::Generators::ActiveModel to access instance methods.
         def orm_instance(name=singular_table_name)
-          @orm_instance ||= @orm_class.new(name)
+          @orm_instance ||= orm_class.new(name)
         end
     end
   end
-- 
cgit v1.2.3


From 4e5eaae1faebe5e889a50a3c3cfade397f39863c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ku=C5=BAma?= <qoobaa@gmail.com>
Date: Sat, 26 Nov 2011 19:57:51 +0100
Subject: added tests, replaced classify with constantize - using classify here
 cuts the last 's' in ORM name

---
 railties/lib/rails/generators/resource_helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index f2195cb81a..3c5b39fa16 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -64,7 +64,7 @@ module Rails
             end
 
             begin
-              "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
+              "#{options[:orm].to_s.camelize}::Generators::ActiveModel".constantize
             rescue NameError
               Rails::Generators::ActiveModel
             end
-- 
cgit v1.2.3


From 78ad94aaa7b70fee6c8f49de04f26d4ec14fa162 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 27 Nov 2011 20:25:05 +0900
Subject: avoid absolute path for the rails.png in index.html

---
 railties/lib/rails/generators/rails/app/templates/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 9d9811a5bf..a1d50995c5 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -59,7 +59,7 @@
 
 
       #header {
-        background-image: url("/assets/rails.png");
+        background-image: url("assets/rails.png");
         background-repeat: no-repeat;
         background-position: top left;
         height: 64px;
-- 
cgit v1.2.3


From 7f8f554d75a4c1fe56fda1cbf39f67a0b32b5c16 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 27 Nov 2011 22:49:37 +0900
Subject: Call a block passed rake_tasks method in the self context

---
 railties/lib/rails/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index f0991b99af..07a122e7d0 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -181,7 +181,7 @@ module Rails
 
     def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each { |block| block.call(app) }
+      self.class.rake_tasks.each { |block| self.instance_exec(app, &block) }
 
       # load also tasks from all superclasses
       klass = self.class.superclass
-- 
cgit v1.2.3


From 8ef1ec427f75a3ca2a2c19737a057ad3f354a9bd Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Mon, 10 Oct 2011 19:02:06 +0530
Subject: global variable `$rails_rake_task' not initialized Warning removed

---
 railties/lib/rails/application/finisher.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 028c8814c4..fc7d205a6f 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -2,6 +2,7 @@ module Rails
   class Application
     module Finisher
       include Initializable
+      $rails_rake_task = nil
 
       initializer :add_generator_templates do
         config.generators.templates.unshift(*paths["lib/templates"].existent)
-- 
cgit v1.2.3


From fe7d4f09ef2296e45ab4a82c1556c63382856607 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Mon, 28 Nov 2011 19:25:37 +0300
Subject: put backtrace_cleaner to env

---
 railties/lib/rails/application.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 25ff74506a..2a62446a04 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -124,7 +124,8 @@ module Rails
         "action_dispatch.parameter_filter" => config.filter_parameters,
         "action_dispatch.secret_token" => config.secret_token,
         "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
-        "action_dispatch.logger" => Rails.logger
+        "action_dispatch.logger" => Rails.logger,
+        "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner
       })
     end
 
-- 
cgit v1.2.3