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

Jump to bottom

a monster merge :( #219

Closed
wants to merge 34 commits into from
Closed

a monster merge :( #219

wants to merge 34 commits into from

Conversation

imajes
Copy link
Collaborator

@imajes imajes commented Feb 21, 2012

Covers -

  • whitespace fixin's. This helps us vim users not go insane
  • improvements to the crypt routines
  • re-implementation of the config init, which relies on an external doc rather than an internal doc format.

imajes and others added 30 commits November 2, 2011 22:48
@imajes
Whitespace fixes - make my vim happy
44a7ae8
@imajes
reformat the authenticate method to be easier to read.
4261719
@imajes
Make 1.8 friendly
ee347fe
@imajes
ignore binstubs
796c1a8
@imajes
Not sure how this works without BCrypt bundled.
f6520fb
@imajes
whitespace. :(
fe4b6c8
@imajes
whitespace again. :(
c684248
@imajes
Clarify the set_encryption_attributes method
66f5217 
A small refactor to make it more rubyish
@imajes
whitespace.
fde85a5
@imajes
require awesome_print in dev
d0e9cfd
@imajes
Refactor the matches? method for BCrypt
f02fc40 
- Use the same hash_secret style as devise
- compare the results in constant time
@imajes
some tests and such to make the pepper version work. all that's left …
f79ed55 
…is to test it in a real app.
@imajes
doh. all these are @...
cb9d503
@imajes
make the respond_to and send work properly
0c15225
@imajes
the salt should still be passed, but we won't use it as we can have b…
d7efb6d 
…crypt tell us the salt)
@imajes
Merge branch 'master' of https://github.com/NoamB/sorcery
ca6a758
@imajes
Merge branch 'master' of https://github.com/NoamB/sorcery
96d7370
@imajes
whitespace.
540924b
@imajes
begin to document the config better
755ea4e
@imajes
attempt to fix salt and encryption
dbbef07
@imajes
more experimentation with github formatting
1bc30ce
@imajes
document the non user options..
f0f8ca2
@imajes
handle salt differently
12ce52f
@imajes
ignore .swp files
a83c4b3
@imajes
Merge branch 'master' of https://github.com/NoamB/sorcery
9ff2cea 
Conflicts:
	lib/generators/sorcery/templates/initializer.rb
	spec/rails3/spec/spec_helper.rb
@imajes
don't match unless you really want case insensitive matching - needs …
274af87 
…to be ported to other adapters and config
@imajes
simplify
0fb9b4f
@imajes
these two are also needed to prevent the earlier hotfix from exploding
51c0e1a
@trvrplk @imajes
Update Gemfile
72bbd0a
@imajes
Merge branch 'master' of https://github.com/NoamB/sorcery into upstream
e839e6b
@imajes imajes closed this Feb 21, 2012
kpaurora pushed a commit to aurorasolar/sorcery that referenced this pull request May 14, 2020
@mingrammer
Fix typo (NoamB#219)
16bb809 
* Fix typo

* Fix 'an' to 'a'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@imajes @trvrplk