Merge pull request #11515 from prathamesh-sonpatki/edit-index-page

Removed information about creating database [ci skip]
Clear named routes when routes.rb is reloaded

Fix an issue where Journey was failing to clear the named routes hash when the
routes were reloaded and since it doesn't overwrite existing routes then if a
route changed but wasn't renamed it kept the old definition. This was being
masked by the optimised url helpers so it only became apparent when passing an
options hash to the url helper.

(cherry picked from commit e5275f9b5924f36f2bdd4dd9ac0a4f420384748f)

Conflicts:
	actionpack/CHANGELOG.md
[Fixes #11512] improves cache size calculation in ActiveSupport::Cache::MemoryStore

Previously, the cache size of `ActiveSupport::Cache::MemoryStore` was calculated
as the sum of the size of its entries, ignoring the size of keys and any data
structure overhead. This could lead to the calculated cache size sometimes being
10-100x smaller than the memory used, e.g., in the case of small values.

The size of a key/entry pair is now calculated via `#cached_size`:

    def cached_size(key, entry)
      key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD
    end

The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical
estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on
1.9.3 and 2.0.

Fixes GH#11512 https://github.com/rails/rails/issues/11512

Conflicts:
	activesupport/CHANGELOG.md
backport efeb039 from #11201 fixes #11540 [ci skip]
Merge pull request #11562 from zzak/backport_efeb039

backport efeb039 from #11201 fixes #11540 [ci skip]
Merge pull request #11566 from rajcybage/master

add the missing middleware in command line guides rake about [ci skip]
Conflicts:
	guides/source/command_line.md
Use GeneratedAttribute#column_name if #reference? scaffold_generator in _form view [Fixes #11573]
Merge pull request #11570 from joelcogen/harmonize_text_field_and_area

text_area should handle nil value option like text_field
Conflicts:
	actionview/CHANGELOG.md
Specified column type for quote_value

When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.

I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.

This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.

I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.

Conflicts:
	activerecord/CHANGELOG.md
Tidy up the "Specified column type for quote_value" changes

This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.

Conflicts:
	activerecord/CHANGELOG.md
don't convert mailer default values to procs

Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc.  That an object is convertible to a proc does not mean it's
meant to be always used as a proc.  Fixes #11533

Conflicts:
	actionmailer/CHANGELOG.md
Merge pull request #11581 from bughit/11533_to_proc_backport

don't convert mailer default values to procs
New CHANGELOG entries are always on top

[ci skip]
Allow overriding of all headers from passed environment hash

Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from
the environment passed into `ActionDispatch::TestRequest.new`.

Fixes #11590

(cherry picked from commit 4db0637d556ab11c55de6afcaa267147a032a74d)

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #11591 from ankit8898/typo

Typo fix [ci skip]
rake -> bin/rake
Don't mutate the Base settings by merge!ing the given value
Merge pull request #11620 from spajus/update_docs

Update Rails 3.2.x guide link [ci skip]
Merge pull request #11653 from ankit8898/typo

Fixing the broken URL [skip ci]
Revert change on ActiveRecord::Relation#order method that prepends new
order on the old ones

The previous behavior added a major backward incompatibility since it
impossible to have a upgrade path without major changes on the
application code.

We are taking the most conservative path to be consistent with the idea
of having a smoother upgrade on Rails 4.

We are reverting the behavior for what was in Rails 3.x and,
if needed, we will implement a new API to prepend the order clauses in
Rails 4.1.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/query_methods.rb
	guides/source/upgrading_ruby_on_rails.md