diff --git a/Gemfile b/Gemfile index 9073a98..00da3f5 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'rails', '~> 3.1.0.rc6' gem 'arel' -gem 'devise' +gem 'devise', :git => 'git://github.com/plataformatec/devise.git' gem 'geokit' gem 'haml', '~> 3.2.0.alpha' gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git' diff --git a/Gemfile.lock b/Gemfile.lock index a5884fe..6ccf152 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/plataformatec/devise.git + revision: 7b1418be3b33ac77cb185c15e641292767112f08 + specs: + devise (1.4.2) + bcrypt-ruby (~> 3.0) + orm_adapter (~> 0.0.3) + warden (~> 1.0.3) + GIT remote: git://github.com/sferik/rails_admin.git revision: e71eafaafd201227988034585303154011146713 @@ -47,8 +56,6 @@ GEM builder (3.0.0) crack (0.1.8) daemons (1.1.4) - devise (1.0.11) - warden (~> 0.10.3) erubis (2.7.0) eventmachine (0.12.10) eventmachine (0.12.10-java) @@ -68,6 +75,7 @@ GEM treetop (~> 1.4.8) mime-types (1.16) multi_json (1.0.3) + orm_adapter (0.0.5) pg (0.11.0) polyglot (0.3.2) rack (1.3.2) @@ -120,8 +128,8 @@ GEM uglifier (1.0.2) execjs (>= 0.3.0) multi_json (>= 1.0.2) - warden (0.10.7) - rack (>= 1.0.0) + warden (1.0.5) + rack (>= 1.0) webmock (1.7.5) addressable (> 2.2.5, ~> 2.2) crack (>= 0.1.7) @@ -132,7 +140,7 @@ PLATFORMS DEPENDENCIES arel - devise + devise! fastercsv geokit haml (~> 3.2.0.alpha)