feldpost (Sebastian Friedrich)

Merge branch 'master' of git://github.com/rails/rails into upstream-master

Fix the application.rb generator

Fix the rackup test to correctly use Rack::Builder.parse_file

Load application specific rake tasks in the application object

Revert "macruby: no format_datetime or msg2str"

Ensure generator fallbacks work even when a context is given.

Also load generators at lib/rails_generators.

Create SyncListener. Since they do not rely on Thread, they can be used on Google App Engine.

Explicit source no longer needed, default gems source points to gemcutter.

macruby: no format_datetime or msg2str

Fix Rails::Rack::Static deprecated constant proxy

Update gemspec also

Should be rackmount 0.2

Depend on rack-mount 0.0.2

Extended and case insensitive regexp routes aren't that important.

Update routing for rackmount 0.2 api changes

Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working"

Add basic nested named route support to new routing dsl. Also add a

Fix test bleed

Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working

Check whether another lib has implemented ruby 1.9 string interp syntax

Extract form_authenticity_param instance method so it's overridable in subclasses

Insert generated association members in the same order they are specified when assigning to a has_many :through using the generated *_ids method

Revert "Ensure Model#destroy respects optimistic locking"

Pass config.generators options along when RAILS_GENERATORS is set and show --force-plural message just once.

Improve Gemfile commentary

Remove --freeze (since Rails will come bundled in all new apps) and update gem action to change Gemfile instead of config.environment.

Ensure ActiveRecord is loaded on revoke/destroy.

Avoid duplicated names on help description and show proper error message if trying to load a Rails 2.x generator.

Fix simple resource named routes for new routing dsl

Use spoofed version bump to ensure git is preferred

Force gemcutter source to ensure a consistent arel version

Work around rebundling issue

Ensure that generators can be invoked from any directory.

Fix chars.reverse for multibyte decomposed strings

Arel::In -> Arel::Predicates::In

Clarify date/time dependencies

Consolidate Object#to_param and #to_query core extensions

Ruby 1.9.2: rational.rb is deprecated

Ruby 1.9.2: URI.escape is obsolete

Ruby 1.9 doesn't recognize EM SPACE as whitespace, breaking String#strip

Give useful test:isolated failures

CI breakage

Merge branch 'master' of git://github.com/rails/rails into upstream-master

Extracted localized_cache.rb from ActionController, added it to AbstractController and made ActionMailer use it.

Allow :instance_reader to be given to superclass_delegating_accessor as well.

Use I18n on ActionMailer subjects by default.

More refactoring on ActionMailer::Base.

Make tests run without deprecation warning (just one left).

Another refactoring on AM. body is deprecated, use render instead.

Add some basic render_test to AbstractController.

Improve AbstractController layouts coverage.

Move some of helper tests to AbstractController.

Move all render and layout pieces required in ActionMailer from ActionController to AbstractController.

Remove ActionMailer helpers and rely on AbstractController one.

Refactor ActionMailer layout and remove legacy one.

abstract all of the ActionMailer delivery methods into their own classes. thereby the following are equivalent

Remove the random line at the beginning of every new log file

Caching refactoring

Generators should use Rails.root instead of Dir.pwd [#3408 status:resolved]

First pass at cleaning up action caching

Make polymorphic_url work with symbols again and refactor it [#1384 status:resolved]

Use public submodule url

Make ruby-debug optional

exists? method now uses ARel

Added arel_attributes_values methods, refactored locking and AR#update to use this method

Merge commit 'rails/master'

Merge commit 'rails/master'

Calculations now use Arel to construct the query.

construct_finder_sql now use Arel

Refactored locking update

Merge commit 'rails/master'

Changed locking to use Arel. Arel updated

Added ruby-debug

Remove connection method definition, since it's called just once.

More progress on migrations. Arel updated.

Added Arel integration to migration's version update table

Arel updated

Removed blank lines

Require Arel

Added arel as a submodule. This is temporary and will make development/testing easier.

Merge branch 'master' of git://github.com/rails/rails into upstream-master

Initialize a new instance of Rails.application during integration tests

Remove all calls to Rails::Initializer from boot.rb

Remove a duplicate initializer

Change Rails::Application to a class that is inherited from.

Remove unneeded files from the railties test directory

Fix the broken railties isolation tests

Create the application object from config/environment.rb

Ported the new ActionView::TestCase from 2-3-stable to master [#3260