ActiveSupport::Notifications::Instrumenter#instrument should yield
its payload the same way that ActiveSupport::Notifications does.
Fix spelling in test name.
Use define_method when method name contains weird characters.
drop variable assignment in validations
Merge pull request #9945 from vipulnsward/drop_var_in_validations

Drop variable assignment in validations
Use thor master since 0.18.0 has a regression

See
https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a
for the discussion and https://github.com/wycats/thor/pull/316 for the
fix
mention strong parameters in complex forms section of the guides.

Closes #9921.
Merge pull request #8368 from SamSaffron/master

Allow connection_handler to be overriden per-thread
Merge pull request #9947 from senny/strong_params_doc_for_complex_forms

mention strong parameters in complex forms section of the guides.
drop errors constant
Fixed typos in activerecord
Merge pull request #9952 from prathamesh-sonpatki/AR-typos

Fixed typos in activerecord
Merge pull request #9949 from vipulnsward/drop_yaml_error_constant

drop errors constant
Provides standard layout lookup behavior for method and proc cases

When setting the layout either by referencing a method or supplying a
Proc there is no way to fall back to the default lookup behavior if
desired. This patch allows fallback to the layout lookup behavior when
returning nil from the proc or method.
entirelyby => 'entirely by'
Merge pull request #9954 from neerajdotname/space_after_entirely

entirelyby => 'entirely by'
Merge pull request #8458 from lucisferre/improve-layout-override-fallback-behavior

Provides standard layout lookup behavior for method and proc cases

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names

Use define_method when method name contains weird characters.
Fix syntax error
Cosmetic cleanup of generated Gemfile

- Remove obsolete/misleading comment about assets only being used production
- Remove unnecessary group :assets
- Eliminate blank lines if options[:skip_javascript] is not specified
Remove buggy and unnecessary logic

based on a discussion with @rafaelfranca