removed :  warning: `*' interpreted as argument prefix
Merge pull request #7466 from arunagw/warning_removed_ap

removed :  warning: `*' interpreted as argument prefix
fixes a bug in dependencies.rb

loaded stores file names without the .rb extension, but search_for_file
returns file names with the extension.

The solution is hackish, but this file needs a revamp.
Add Missing Keys from Journey on failed URL format

Many named routes have keys that are required to successfully resolve. If a key is left off like this:

    <%= link_to 'user', user_path %>

This will produce an error like this:

    No route matches {:action=>"show", :controller=>"users"}

Since we know that the :id is missing, we can add extra debugging information to the error message.

    No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id]


This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. 

While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. 

This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. 

Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421
refactor route_set `generate_extras` functionality

The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters.

ATP Actionpack, railties
Fixes wrong test class names.
Remove unused require.
Merge pull request #7468 from kennyj/tiny_fixings

Tiny fixes in railties/test/application.
Fixes warnings when executing rake test in ActionMailer. Related to 582a7f459990487659886b90e54c22e055c65870
Merge pull request #7469 from kennyj/fix_many_warnings_in_am

Fixes warnings when executing rake test in ActionMailer. 
Fix method redefined warnings.
Merge pull request #7470 from kennyj/fix_method_redefined_warning

Fix method redefined warnings.
detect circular constant autoloading

Nowadays circular autoloads do not work, but the user gets a NameError
that says some constant is undefined. That's puzzling, because he is
normally trying to autoload a constant he knows can be autoloaded.
With this check we can give a better error message.
CHANGELOGs are now per branch

Changes in old branches needed to be manually synched in CHANGELOGs of newer ones.
This has proven to be brittle, sometimes one just forgets this manual step.
With this commit we switch to CHANGELOGs per branch. When a new major version is
cut from master, the CHANGELOGs in master start being blank.

A link to the CHANGELOG of the previous branch allows anyone interested to
follow the history.
Add a test to make sure preloading properly merges association and default scope conditions
Merge pull request #109 from aantix/default_security_headers_clarifications

Added clairifications for default security headers.
Fixed indendation
Merge pull request #7476 from ayrton/fixed_indentation

Fixed indendation
Added missing require. When performing rake test:isolated, test/base_test.rb was break.
fixes a regexp

We need to anchor to remove the extension. In addition to
be the correct way to do that, files in ~/.rbenv get that
.rb removed, so it is a real source of bugs, as reported in

https://github.com/rails/rails/commit/b33700f5580b4cd85379a1dc60fa341ac4d8deb2#commitcomment-1781840