Merge branch 'master' of github.com:rails/rails
Merge pull request #17480 from gsamokovarov/exception-wrapper-traces

Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
Added SchemaDumper support for tables with jsonb columns.
Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_types

Added SchemaDumper support for tables with jsonb columns
Mention that articles resource should be added by user in getting started guide

[ci skip]
Merge pull request #17508 from prathamesh-sonpatki/mention-adding-resources-to-routes

Mention that articles resource should be added by user in getting started guide

Fixes #17507 [ci skip]
add a test for #17106
activerecord: rake db:create shows underlying error message.
add lib to $LOAD_PATH on application inhertence. fixes #17106
Merge branch '17106'

* 17106:
  add lib to $LOAD_PATH on application inhertence. fixes #17106
  add a test for #17106
[ci skip] Fixup spelling and grammar in 4.2 guides

Capitalize CSS, SQL

Change spelling of favour to favor - updated for consistency,
the rest of the document uses "favor".

Grammar / spelling pass
Merge pull request #17513 from eileencodes/cleanup-rails-4.2-release-notes

Fixup spelling and grammar in 4.2 guides
[ci skip] fix `config.assets.digest` default value
Merge pull request #17514 from y-yagi/configuring_guide

[ci skip] fix `config.assets.digest` default value
Fix broken string_ext_test due to change in timezone

- Russian time was changed to UTC+3 from UTC+4 recently. This broke the
  string_to_ext test.
Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport

Fix broken string_ext_test due to change in timezone
Removed the unused require of proxy_object and test related to it

- Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359
- Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
Merge pull request #17515 from prathamesh-sonpatki/rm-require

Removed the unused require of proxy_object
Remove skip-gems from 4-2 release notes

- This option was removed in https://github.com/rails/rails/commit/bf17c8a531bc80.
- [ci skip]
Merge pull request #17473 from vipulnsward/rm-unused-method

Remove unused duplicated method `add_column_position` from AbstractMysqlAdapter.