Change OmniAuth flash wording (authorize->authenticate)
Merge pull request #1681 from abevoelker/change-omniauth-flash-wording

Change OmniAuth flash wording (authorize->authenticate)
Fixing two tests
Update lib/devise/rails/routes.rb
Do not call after sign in hook without resource, closes #1666.
Update CHANGELOG
Changelog update
Changelog adjustments
Revert "Move devise/shared/_links.erb to devise/_links.erb"

This reverts commit aa2d15aa338cd1e83462d58ff4eec1ce5fa122fb.

Conflicts:

	CHANGELOG.rdoc
Deprecation warning
Added a missing hide!
Merge pull request #1696 from plataformatec/reverting

Adding back links partial to shared
Deprecation warning on module doesn't have a required_fields method
Fixing a deprecation warning
Moved a method to support
Failure is better than exceptions
Minor fixes on models_test
Merge branch 'deprecating-ausence-of-required-fields'
Changelog
Update CHANGELOG.rdoc