leap_web.git/Gemfile.lock, branch 0.2.2

don't track Gemfile.lock

2012-11-12T18:22:27+00:00

Merge branch 'develop' into feature-warden-srp

2012-11-04T16:57:03+00:00

Conflicts:
	Gemfile.lock
	users/app/controllers/application_controller.rb
	users/leap_web_users.gemspec

using ruby-srp 0.1.4 - ruby 1.9.3 compatible

2012-11-04T15:36:01+00:00

using rails_warden bit of refactoring

2012-10-30T13:42:04+00:00

without rails_warden the failure app action was not getting set properly.

adding in warden with a basic strategy

2012-10-30T11:32:10+00:00

currently failing because we are not setting the content-type header.

Merge branch 'develop' into help_develop

2012-10-17T17:12:11+00:00

Not sure we actually want this in version control, but adding changes so long as we have it.

2012-10-17T17:04:34+00:00

UI tweaks including newer version of bootstrap

2012-10-17T13:41:44+00:00

use ruby-srp 0.1.3 which returns the user on authenticate call

2012-10-11T15:11:32+00:00

Also removed a few hooks to User.current. Will replace with current_user

moved core dependency into */Gemfile with :path

2012-10-11T08:22:34+00:00

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.