Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: plataformatec/devise
...
head fork: plataformatec/devise
Commits on Feb 17, 2012
@mreinsch mreinsch fix for :host getting overwritten in scope[:options] and thus not gen…
…erating URLs with correct hostnames
0315ca2
@josevalim josevalim Merge pull request #1661 from mreinsch/fix_subdomain_routing
fix for when using :host in routes
a0a141b
@josevalim josevalim Fix regression where warden was being configured too early. fc3af50
@josevalim josevalim Update CHANGELOG. d15d0ba
@josevalim josevalim Release 2.0.4 f2b4ba6
@josevalim josevalim Update CHANGELOG. b0b01da
@georgeguimaraes georgeguimaraes typo b190fa3
Commits on Feb 18, 2012
@rafaelfranca rafaelfranca Update CHANGELOG.rdoc 0f8e472
Commits on Feb 20, 2012
@josevalim josevalim Remove deprecated examples from README, closes #1669. 5a05486
Commits on Feb 21, 2012
@RogerE RogerE Use rememberable_options instead of deprecated cookie_options in init…
…ializer
de24170
@josevalim josevalim Merge pull request #1672 from RogerE/rememberable_options-in-initializer
Use rememberable_options instead of deprecated cookie_options in initializer
989fd92
@josevalim josevalim Update .travis.yml e3df7f0
Commits on Feb 22, 2012
Rodrigo Flores Added check_model! method 9667a38
Rodrigo Flores Added required_fields to database_authenticatable 8ac8129
Rodrigo Flores :scissors: whitespaces 1bbae01
Rodrigo Flores Required fields on confirmable 6489354
Rodrigo Flores Required fields on encryptable 533511f
Rodrigo Flores Required fields on token_authenticatable f3bace5
Rodrigo Flores Required fields on trackable 890f603
Rodrigo Flores Some refactor 18aef6a
Rodrigo Flores Added required_fields to rememberable bee8784
Rodrigo Flores Added required_fields to recoverable ce3422e
Rodrigo Flores Added required fields to lockable 85f2f88
Rodrigo Flores Test, you shall pass! 2ab1086
Rodrigo Flores Added a missing test and asserting same content for 1.8 compatibility d7337c5
Rodrigo Flores Fixing some tests and adding an assert message faf8b01
Rodrigo Flores No need to sort anymore e3412d4
Rodrigo Flores One exception to rule them all bc11e9f
Rodrigo Flores Added required_fields when reconfirmable a909bfa
Rodrigo Flores Changed message and refactored exception to use a initializer 803e4f5
@josevalim josevalim Merge pull request #1673 from plataformatec/check_attributes_rebased
Check attributes on models
c5cb60a
@lucasmazza lucasmazza Fix the assert_same_content assertion helper
and a broken confirmable test.
64c05f2
@rodrigoflores rodrigoflores Merge pull request #1675 from plataformatec/fix_assertion
Fix the assert_same_content assertion helper
23ae04e
Commits on Feb 23, 2012
@josevalim josevalim Update lib/devise/controllers/helpers.rb 88d6858
@codeodor codeodor Include note about restarting the rails app if it's already running, …
…because the last 2 apps I used Devise with, I could not figure out why I was getting very strange errors, and finally today I figured out it was due to the fact that it needed to reload.
61e85a5
@carlosantoniodasilva carlosantoniodasilva Merge pull request #1679 from codeodor/patch-1
Include note about restarting the rails app if it's already running
07a41ec
Commits on Feb 24, 2012
@abevoelker abevoelker Change OmniAuth flash wording (authorize->authenticate) 3ac2c1d
Rodrigo Flores Added required fields to validatable 6d5bccc
Rodrigo Flores Adding required_fields to all modules 5ef35ee
Commits on Feb 25, 2012
Rodrigo Flores Changelog 4ce7854
Commits on Mar 03, 2012
@rodrigoflores rodrigoflores Merge pull request #1681 from abevoelker/change-omniauth-flash-wording
Change OmniAuth flash wording (authorize->authenticate)
f1d991f
Rodrigo Flores Fixing two tests bb4f699
@josevalim josevalim Update lib/devise/rails/routes.rb b932888
@josevalim josevalim Do not call after sign in hook without resource, closes #1666. 2f6ecc1
@josevalim josevalim Update CHANGELOG b41e5f5
Rodrigo Flores Changelog update 1edae9c
Rodrigo Flores Changelog adjustments 643d560
Rodrigo Flores Revert "Move devise/shared/_links.erb to devise/_links.erb"
This reverts commit aa2d15a.

Conflicts:

	CHANGELOG.rdoc
9bf718d
Rodrigo Flores Deprecation warning f04d883
Rodrigo Flores Added a missing hide! ba80074
@rodrigoflores rodrigoflores Merge pull request #1696 from plataformatec/reverting
Adding back links partial to shared
bc09699
Rodrigo Flores Deprecation warning on module doesn't have a required_fields method ecfc7d7
Rodrigo Flores Fixing a deprecation warning af12ec2
Rodrigo Flores Moved a method to support fffc3b1
Rodrigo Flores Failure is better than exceptions a12f6ec
Rodrigo Flores Minor fixes on models_test 7b7af57
Rodrigo Flores Merge branch 'deprecating-ausence-of-required-fields' 617a887
Rodrigo Flores Changelog 2b79519
@rodrigoflores rodrigoflores Update CHANGELOG.rdoc 15f6255
Commits on Mar 05, 2012
@strzalek strzalek Fix formatting in README 075fc96
@rodrigoflores rodrigoflores Merge pull request #1700 from strzalek/patch-1
Fix formatting in README
b928b8b
Commits on Mar 09, 2012
@josevalim josevalim Add skip_reconfirmation! , closes #1708 0ab28ef
@josevalim josevalim Update CHANGELOG. a394cea
Rodrigo Flores Moved BCrypt logic to a encryptor 9203651
Rodrigo Flores Added compare to encryptors 136b5b0
Rodrigo Flores The signature must be the same c12fc1a
Rodrigo Flores Fixing some arguments order 45298c0
@josevalim josevalim Merge pull request #1709 from plataformatec/extracting_bcrypt
Moved BCrypt logic to a Encryptor
94c05e3
Commits on Mar 10, 2012
@josevalim josevalim Move valid_password? up to database authenticatable. 68de34c
Commits on Mar 13, 2012
Rodrigo Flores Adding symbols only on validate 033e91b
Rodrigo Flores Checking required fields on lockable a7658f9
Rodrigo Flores Fixing lockable to use the correct method 61929d2
@rodrigoflores rodrigoflores Merge pull request #1716 from plataformatec/validate_symbol
Validate is now a boolean function and unautheticated_symbol returns the symbol
939d0f2
Commits on Mar 15, 2012
@hakanensari hakanensari Fix redirect when authenticating mounted apps b37a745
@josevalim josevalim Merge pull request #1719 from hakanensari/mounted-app-redirect
Fix redirect when authenticating mounted apps
2cab75d
Rodrigo Flores Bumping to 2.1.0.rc 91ba14e
Rodrigo Flores OMG Forgot to update the Changelog 9d724cb
Commits on Mar 17, 2012
Rodrigo Flores Indentation + Typo a1376ac
Commits on Mar 19, 2012
Rodrigo Flores failed_attempts is set to 0 on sign in 3623215
Rodrigo Flores Changelog ca73dae
Rodrigo Flores Hook should be on lockable not recoverable and removed an useless com…
…ment
e6af976
@josevalim josevalim Merge pull request #1726 from plataformatec/failed_attempts
Setting failed_attempts to 0 after sign in
e92ae37
Commits on Mar 21, 2012
@davout davout Ability to use `attr_protected` attributes as sign-in keys without tr…
…iggering `ActiveModel::MassAssignmentSecurity::Error` when `ActiveRecord::Base.mass_assignment_sanitizer` is set to `:strict`. Fixes #1729.
885d883
Commits on Mar 25, 2012
@parndt parndt Bumped orm_adapter requirement up to ~> 0.0.7 per ianwhite/orm_adapte… 473a68d
@josevalim josevalim Merge pull request #1738 from parndt/patch-1
Bumped orm_adapter requirement up to ~> 0.0.7 per ianwhite/orm_adapter#10
e9a8c6c
Commits on Mar 26, 2012
@josevalim josevalim Merge pull request #1730 from Paymium/issue-1729
Fix for #1729
e860ade
@josevalim josevalim Update CHANGELOG.rdoc c3c0f4b
@josevalim josevalim Fix build so it works with Rails 3.1. b74f71f
Commits on Mar 28, 2012
@rosenfeld rosenfeld Fix minor typo on settings template ac7b1b3
@josevalim josevalim Merge pull request #1745 from rosenfeld/patch-3
Fix minor typo on settings template
18829a5
@rosenfeld rosenfeld config.use_salt_as_remember_token is no longer supported 076f4b4
Commits on Mar 29, 2012
@josevalim josevalim Merge pull request #1749 from rosenfeld/patch-5
config.use_salt_as_remember_token is no longer supported
f94b710
Josh Knox & Ken Mayer Fix Authenticatable, call find_for_authentication 1d3b894
Commits on Mar 30, 2012
@rodrigoflores rodrigoflores Merge pull request #1754 from pivotalhalogen/master
Shiny new pull request for #1752
a4c9d58
@josevalim josevalim Revert "Merge pull request #1754 from pivotalhalogen/master"
find_for_authentication should be called during only during
an authentication process.

This reverts commit a4c9d58, reversing
changes made to f94b710.
25a5631
@josevalim josevalim Update docs to make find_for_authentication purpose more clear. 60d2c6f
@josevalim josevalim Wording. b59ce51
@josevalim josevalim Remember token is not required. f1ccaf8
@josevalim josevalim Fix failing test. 52b4bab
@rosenfeld rosenfeld Fix typo f49b605
@josevalim josevalim Merge pull request #1759 from rosenfeld/patch-6
Fix typo
9f99ccd
Commits on Mar 31, 2012
@rosenfeld rosenfeld Fix require for rememberable strategy 8a50b20
@josevalim josevalim Merge pull request #1761 from rosenfeld/patch-7
Fix require for rememberable strategy
205ddfb
Commits on Apr 02, 2012
@Antiarchitect Antiarchitect Authentication token expiration on session timeout 7ecbba0
Commits on Apr 04, 2012
Rodrigo Flores Updating the README since we won't have more private messages on Github 45aca40
@bloudermilk bloudermilk Fixes syntax highlighting in the "Getting started" section of the README 85e4a0e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #1776 from bloudermilk/patch-1
Fixes syntax highlighting in the "Getting started" section of the README
3cbced4
@rodrigoflores rodrigoflores Merge pull request #1722 from Antiarchitect/master
Token regeneration on session timeout.
857af60
Rodrigo Flores Changelog and a minor change on the test title 07ef99a
Commits on Apr 05, 2012
@josevalim josevalim Do not make _prefixes private. 6846014
@josevalim josevalim Do not accidently mark _prefixes as private. dacdc72
Commits on Apr 07, 2012
@cmeiklejohn cmeiklejohn Ensure ActiveRecord is defined, which is not true when running Mongoi…
…d tests.
eb4e232
Commits on Apr 08, 2012
@josevalim josevalim Merge pull request #1780 from cmeiklejohn/master
Verify AR constant is defined in test suite.
cef5c93
Commits on Apr 09, 2012
@georgeguimaraes georgeguimaraes Changes link in copyright notice to Plataformatec's site d435118
Rodrigo Flores Updated changelog to include the removal of render_with_scope
Closes #1737
64c99bc
Commits on Apr 16, 2012
@aderyabin aderyabin removed global namespaces 9ec1003
@josevalim josevalim Merge pull request #1794 from aderyabin/master
Clean up global namespaces
3752981
Commits on Apr 17, 2012
@mkremer mkremer Added after_sending_reset_unlock_instructions_path_for which can be o…
…verridden in extensions to modify the redirect path
fafea15
@mkremer mkremer Added after_unlock_path_for to allow override of redirect after account
unlock
0e0bfe6
Commits on Apr 18, 2012
@rosenfeld rosenfeld sqlite3-ruby was renamed to sqlite3 ee29bf8
Commits on Apr 22, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #1796 from mkremer/feature/devise_redirects
Added after_sending_reset_unlock_instructions_path_for
49873f4
@carlosantoniodasilva carlosantoniodasilva Change method name ec3eed5
@carlosantoniodasilva carlosantoniodasilva Merge pull request #1804 from rosenfeld/sqlite
sqlite3-ruby was renamed to sqlite3
0cfc88d
Commits on Apr 24, 2012
@carlosantoniodasilva carlosantoniodasilva Change Copyright also in license file [ci skip]
See d435118 for the readme change.
cba1820
Commits on Apr 27, 2012
Agis Anastasopoulos Apply the 80 chars per-line rule d6f4d93
@rodrigoflores rodrigoflores Merge pull request #1813 from Agis-/patch-1
Break the line so it doesn't exceed 80-chars limit
852a6ff
@carlosantoniodasilva carlosantoniodasilva Use sqlite3 gem for 3.1 Gemfile f6c06ac
Commits on May 02, 2012
@rosenfeld rosenfeld Better handling of previously enabled Devise model deserialization 411b565
Rodrigo Flores Generators on engine fix afc3888
Rodrigo Flores Changelog 22c210c
Rodrigo Flores Upgrading Rails 3.1 to 3.1.4 4bf4036
Rodrigo Flores Testes passing on 3.1 \o/ 271eac7
@josevalim josevalim Merge pull request #1823 from plataformatec/bugfix-engine-generator
Fixes generator on engine
e6717e3
@josevalim josevalim Merge pull request #1805 from rosenfeld/deserialization-handling
Better handling of previously enabled Devise model deserialization
67f2074
Rodrigo Flores Cached the class_path and changed a variable name (kudos to @britto!) 34a6407
Rodrigo Flores Refactoring simulation inside engine to decide based on the api 525bcd4
Commits on May 03, 2012
@julianvargasalvarez julianvargasalvarez Use 'head :no_content' in sessions_controller#destroy
Code cleanup for returning headers instead of an empty string
when destroying sessions.

Lines 464 and 471 on test/integration/autenticatable_test.rb
were adjusted to assert on :no_content
6664acd
@josevalim josevalim Merge pull request #1825 from julianvargasalvarez/master
Use 'head :no_content' in sessions_controller#destroy
d376d11
Commits on May 06, 2012
@mattconnolly mattconnolly Adding a test for a warden strategy retuning a custom response. 66f74ed
@mattconnolly mattconnolly Completing test and functionality for TestHelper to correctly return …
…a custom response from a warden strategy.
90a63d4
@mattconnolly mattconnolly Changing test to not bother with saved response, since it wasn't set …
…by the test.
2a3a8b8
@mattconnolly mattconnolly Updating process unauthenticated to set the response so it can be tes…
…ted.
32d2f78
@mattconnolly mattconnolly Reinstating tests for the controller test's response object. This doe…
…s need to be set so the strategy's custom response can be tested.
a9b7a4a
@josevalim josevalim Do not reproduce warden behavior, simply rely on the controller calli…
…ng it
5e845ee
@josevalim josevalim Merge branch 'test_helpers' a8d2dce
@josevalim josevalim Speed up bcrypt handling 4600b4a
@josevalim josevalim Remove faux bcrypt encryptor from Devise (it was never released and i…
…t wont be until we solve the encryptable issue
b07dd76
@josevalim josevalim Update CHANGELOG 7aa93a3
@josevalim josevalim Get rid of deprecated code 32f20dd
Commits on May 07, 2012
Rodrigo Flores Removing encryptable module 768f883
Rodrigo Flores Removing encryptors and its autoloads 5f440df
Commits on May 09, 2012
Rodrigo Flores Removed ENCRYPTORS_LENGTH 0d868b9
@josevalim josevalim Alternative solution to failure app's script name handling (tests upc…
…oming)
ad0aed3
@josevalim josevalim Add a test case to previous commit 65ef259
Rodrigo Flores Removed encryptable references on rails_app 39dc9a7
Rodrigo Flores Changelog 2e50204
Rodrigo Flores Using bundler's awesome way to release the gem! 659ec4d
Rodrigo Flores Fixing gem name bb6d733
Rodrigo Flores Merge branch 'removing_encryptable' 1698f0f
@josevalim josevalim Try to fix the build for rails 3.1 454a5ad
Rodrigo Flores Updating README 52c35b1
Rodrigo Flores Bumping version to 2.1.0.rc2 afbcc31
Rodrigo Flores Updated Gemfile.lock 36db032
Commits on May 10, 2012
Rodrigo Flores Removing mentioning encryptable on README 50b4d2e
@hosamaly hosamaly Added links to module RDocs, except for Encryptable which I couldn't …
…find.
d193802
Rodrigo Flores Merge branch 'fork-readme-rdoc-links' 120ca0e
Commits on May 14, 2012
Rodrigo Flores Adding a line break on resource generator after attr_accessible
Fixes issue #1851
5ed6534
Rodrigo Flores Fixing a phrase on README 308275c
@asanghi asanghi Minor updates suggested to default language in locales. Be consistent…
… with "email" and "e-mail"; email address exists "in" our database not "on" our database.
ff6e30c
Rodrigo Flores Fixing tests 8baacec
Rodrigo Flores Merge branch 'asanghi-fixes' f95513e
Commits on May 15, 2012
@adzap adzap Add resource_params internal helper to param filtering
In light of recent discussions around mass assignment security and
the alternate solution of using the controller to filter params, not the model,
a hook/helper is needed to be able to override how the params are filtered
before they are used to build the resource.
7ec4c14
@josevalim josevalim Merge pull request #1853 from adzap/master
Add resource_params controller method as helper to allow overriding params used to build resource
85ea531
Rodrigo Flores Fixing README to reflect 2.1.0 release 30ca072
Rodrigo Flores Bumping to 2.1.0 f1db080