fix formatting and text for ActionController::Redirecting doc
Merge pull request #15221 from laurelfan/doc-fix-redirecting

fix formatting and text for ActionController::Redirecting doc
Add missing nodocs to MySQL adapter
Revert "Merge pull request #14544 from jefflai2/named_scope_sti"

This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing
changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/comment.rb

This change break integration with activerecord-deprecated_finders so
I'm reverting until we find a way to make it work with this gem.
Merge pull request #14613 from Sirupsen/fix-serialize-update-column

Fix serialized field returning serialized data after update_column

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15219 from sgrif/sg-missing-nodoc

Add missing nodoc
Rename `oid_type` to `cast_type` to make PG columns consistent
Merge pull request #15227 from sgrif/sg-rename-oid-type

Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns
fixes in active record query for reorder
Merge pull request #15229 from peeyushsingla/master

fixes in active record query for reorder in rails guides
Fix typo guides/source/active_support_instrumentation.md
Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_instrumentation

Fix typo guides/source/active_support_instrumentation.md [ci-skip]
push the formatter up to the Route object
do not mutate parameters, let the caller do mutations
make variable name more clear
reduce object allocations

Example:

x = [1,2,3,4]
y = [3,2,1]

def test x, y
  hash = {}
  x.zip(y) { |k,v| hash[k] = v }
  hash
end

def test2 x, y
  Hash[x.zip(y)]
end

def test3 x, y
  x.zip(y).each_with_object({}) { |(k,v),hash| hash[k] = v }
end

def stat num
  start = GC.stat(:total_allocated_object)
  num.times { yield }
  total_obj_count = GC.stat(:total_allocated_object) - start
  puts "#{total_obj_count / num} allocations per call"
end

stat(100) { test(x,y) }
stat(100) { test2(x,y) }
stat(100) { test3(x,y) }

__END__
2 allocations per call
7 allocations per call
8 allocations per call
reuse path formatter from the non-optimized path.

The optimized and non-optimized path share more code now without
significant performance degretation
Move extract_scale to decimal type

The only type that has a scale is decimal. There's a special case where
decimal columns with 0 scale are type cast to integers if the scale is
not specified. Appears to only affect schema dumping.
we can just use Ruby here
remove dead code. @klass isn't used anymore