waiting for the new devise gem (coming probably this week)
This commit is contained in:
parent
b383086242
commit
9169cb386e
1
.gitignore
vendored
1
.gitignore
vendored
@ -36,3 +36,4 @@ doc/bushido
|
||||
*.swp
|
||||
.sass-cache/
|
||||
spec/dummy/tmp/
|
||||
spec/dummy/log/*
|
||||
|
5
Gemfile
5
Gemfile
@ -6,9 +6,8 @@ gem 'rake', '0.9.2'
|
||||
|
||||
gem 'rails', '~> 3.1.1'
|
||||
|
||||
gem 'warden', :path => '../gems/warden' # FIXME: git clone git@github.com:locomotivecms/warden.git; git checkout scoped_failure_app
|
||||
gem 'devise', :path => '../gems/devise' # FIXME: git clone git@github.com:locomotivecms/devise.git; git checkout simple_scoped_mailer
|
||||
# gem 'devise', '~> 1.4.9'
|
||||
gem 'devise', :git => 'git://github.com/plataformatec/devise.git'
|
||||
# gem 'devise', '~> 1.4.9' # FIXME: waiting for the new devise gem coming soon
|
||||
gem 'cancan', '~> 1.6.7'
|
||||
|
||||
gem 'bson', '~> 1.3.1'
|
||||
|
25
Gemfile.lock
25
Gemfile.lock
@ -8,6 +8,15 @@ GIT
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/plataformatec/devise.git
|
||||
revision: 58d61c290a8254e372a7cbbace5cb138085f7c6e
|
||||
specs:
|
||||
devise (1.5.0.dev)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.0.3)
|
||||
warden (~> 1.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/yabawock/handlebars-rails.git
|
||||
revision: a09077aa91f10e08403af84586b2f2f0b38d9e2f
|
||||
@ -27,19 +36,6 @@ PATH
|
||||
carrierwave-mongoid (~> 0.1.3)
|
||||
mongoid (~> 2.3.2)
|
||||
|
||||
PATH
|
||||
remote: ../gems/devise
|
||||
specs:
|
||||
devise (1.5.0.dev)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.0.3)
|
||||
|
||||
PATH
|
||||
remote: ../gems/warden
|
||||
specs:
|
||||
warden (1.1.0)
|
||||
rack (>= 1.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
@ -314,6 +310,8 @@ GEM
|
||||
kgio (~> 2.4)
|
||||
rack
|
||||
raindrops (~> 0.6)
|
||||
warden (1.1.0)
|
||||
rack (>= 1.0)
|
||||
will_paginate (3.0.2)
|
||||
xpath (0.1.4)
|
||||
nokogiri (~> 1.3)
|
||||
@ -377,6 +375,5 @@ DEPENDENCIES
|
||||
spork (~> 0.9.0.rc)
|
||||
uglifier (~> 1.0.4)
|
||||
unicorn
|
||||
warden!
|
||||
will_paginate (~> 3.0.2)
|
||||
xpath (~> 0.1.4)
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user