Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a monster merge :( #219

Closed
wants to merge 34 commits into from
Closed

a monster merge :( #219

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
44a7ae8
Whitespace fixes - make my vim happy
imajes Nov 3, 2011
4261719
reformat the authenticate method to be easier to read.
imajes Nov 3, 2011
ee347fe
Make 1.8 friendly
imajes Nov 3, 2011
796c1a8
ignore binstubs
imajes Nov 3, 2011
f6520fb
Not sure how this works without BCrypt bundled.
imajes Nov 3, 2011
fe4b6c8
whitespace. :(
imajes Nov 3, 2011
c684248
whitespace again. :(
imajes Nov 3, 2011
66f5217
Clarify the set_encryption_attributes method
imajes Nov 3, 2011
fde85a5
whitespace.
imajes Nov 3, 2011
d0e9cfd
require awesome_print in dev
imajes Nov 3, 2011
f02fc40
Refactor the matches? method for BCrypt
imajes Nov 3, 2011
f79ed55
some tests and such to make the pepper version work. all that's left …
imajes Nov 3, 2011
cb9d503
doh. all these are @...
imajes Nov 3, 2011
0c15225
make the respond_to and send work properly
imajes Nov 3, 2011
d7efb6d
the salt should still be passed, but we won't use it as we can have b…
imajes Nov 3, 2011
ca6a758
Merge branch 'master' of https://github.com/NoamB/sorcery
imajes Nov 3, 2011
96d7370
Merge branch 'master' of https://github.com/NoamB/sorcery
imajes Nov 3, 2011
540924b
whitespace.
imajes Nov 4, 2011
755ea4e
begin to document the config better
imajes Nov 4, 2011
dbbef07
attempt to fix salt and encryption
imajes Nov 4, 2011
1bc30ce
more experimentation with github formatting
imajes Nov 4, 2011
f0f8ca2
document the non user options..
imajes Nov 4, 2011
12ce52f
handle salt differently
imajes Nov 4, 2011
a83c4b3
ignore .swp files
imajes Nov 4, 2011
9ff2cea
Merge branch 'master' of https://github.com/NoamB/sorcery
imajes Nov 15, 2011
274af87
don't match unless you really want case insensitive matching - needs …
imajes Nov 22, 2011
0fb9b4f
simplify
imajes Nov 22, 2011
51c0e1a
these two are also needed to prevent the earlier hotfix from exploding
imajes Nov 22, 2011
72bbd0a
Update Gemfile
trvrplk Nov 28, 2011
e839e6b
Merge branch 'master' of https://github.com/NoamB/sorcery into upstream
imajes Dec 7, 2011
0104ac5
Merge branch 'master' of https://github.com/NoamB/sorcery
imajes Jan 23, 2012
91a2cd4
final documentation changes
imajes Feb 21, 2012
849c8b8
Merge branch 'master' of https://github.com/NoamB/sorcery
imajes Feb 21, 2012
8a55734
Fix support for downcase_username_before_authenticating with mongoid
imajes Feb 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/NoamB/sorcery into upstream
  • Loading branch information
@imajes
imajes committed Dec 7, 2011
commit e839e6b2575beab6acc4754dd08c185b41484741

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.