Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
Gemfile.lock
|
|
|
|
|
|
|
|
|
|
|
|
also commented the sessions controller test a bit and fixed it
|
|
|
|
Conflicts:
users/app/assets/javascripts/srp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and thus merging into feature-admin_users branch.
|
|
config file.
|
|
Conflicts:
users/app/controllers/application_controller.rb
users/app/models/user.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
still need to translate these
|
|
without rails_warden the failure app action was not getting set properly.
|
|
currently failing because we are not setting the content-type header.
|
|
|
|
|
|
|
|
* once tested as helper
* once tested as @controller.send...
|
|
|
|
|
|
|
|
|
|
This reverts commit 439e27ef2792a03e5e50f8b9c607fca512cb1452.
Conflicts:
config/cert
|
|
|