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
|
|
|
|
|
|
|
|
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...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
.gitignore
|
|
|
|
Also removed a few hooks to User.current. Will replace with current_user
|
|
handshake.to_json now returns what we want.
|
|
|
|
In order to get the rails generators and the like to work properly in engines we need to require all the dependencies in the engine.rb file.
Since I want to keep that list of engines in a centralized place we still need core and we need to require it from the other engines.
We don't want to require the core gem to be installed so I added it with :path option to the Gemfile.
|
|
|
|
Conflicts:
.gitignore
|