Properly namespace DatabaseTasks
Merge pull request #10950 from appscape-forks/fix-wrong-method-name

Fix wrong method name
Merge pull request #10924 from pjg/patch-1

Grammar fix [ci skip]
Merge pull request #10925 from senny/10917_test_to_prevent_regression

regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:

	activerecord/CHANGELOG.md
:scissors:

[ci skip]
Wrap text on 80 columns

This make easier to review the source file

[ci skip]
Merge pull request #10727 from pacoguzman/fix-xml-mini-tests

Fix XmlMini different backends tests
Merge pull request #10960 from pacoguzman/fix-build-due-to-10727

Fix build after #10727
Merge pull request #10969 from davidcelis/case-insensitive-asset-path

Use a case insensitive URI Regexp for #asset_path
fix serialization type cast when value is already unserialized
add test for 9041454def79d8e61cabe49e7c5cb72cef29138b
just construct real objects rather than mock and stub
remove bind values for where clauses that were removed

Cherry picking following commit did not work.
https://github.com/rails/rails/commit/50823452f70341447a010df27dd514fd97bfe8a9

This commit is backport of the above commit for 4-0-stable.

fixes #10958
Merge pull request #10981 from neerajdotname/10958

remove bind values for where clauses that were removed
Fixed ActiveModel::Model's inclusion chain
Merge pull request #11004 from fredwu/4-0-activemodel-inclusion-chain-fix

Fixed ActiveModel::Model's inclusion chain
Fixes AciveModel::Model with no ancestors, fixes #11004

Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
Merge pull request #11020 from fredwu/master-activemodel-inclusion-chain-fix-iii

ActiveModel::Model inclusion chain backward compatibility
Don't remove trailing slash from PATH_INFO for mounted apps

Previously when app was mounted as following:

    class Foo
      def call(env)
        [200, {}, [env['PATH_INFO']]]
      end
    end

    RackMountRailsBug::Application.routes.draw do
      mount RackTest.new => "/foo"
    end

trailing slash was removed from PATH_INFO. For example requesting

    GET /foo/bar/

on routes defined above would result in a response containing "/foo/bar"
instead of "/foo/bar/".

This commit fixes the issue.

(closes #3215)

Conflicts:
	actionpack/CHANGELOG.md
Revert "Don't remove trailing slash from PATH_INFO for mounted apps"

This should not be treated as a bug fix, because the behavior was
present in Rails for quite some time and some people may rely on it.

This reverts commit 1193a2738dc751cedcd6155076d68c9851680317.