Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
config file.
|
|
Conflicts:
users/app/controllers/application_controller.rb
users/app/models/user.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also removed a few hooks to User.current. Will replace with current_user
|
|
Conflicts:
.gitignore
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
users/app/controllers/sessions_controller.rb
|
|
access from users engine.
|
|
|
|
|
|
|