diff --git a/Gemfile b/Gemfile index d3b5ffe5..1da4f848 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ gem "rails", "~> 3.2.0" gem "omniauth", "~> 1.0.0" gem "omniauth-oauth2", "~> 1.0.0" gem "rdoc" +gem "warden", :git => "https://github.com/hassox/warden.git" group :test do gem "omniauth-facebook" diff --git a/Gemfile.lock b/Gemfile.lock index 0ab03727..6ad07a2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/hassox/warden.git + revision: 16da284a6d15888ec16c6ea1290dd34f12adf672 + specs: + warden (1.1.0) + rack (>= 1.0) + PATH remote: . specs: @@ -5,7 +12,6 @@ PATH bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) - warden (~> 1.1) GEM remote: http://rubygems.org/ @@ -137,8 +143,6 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.31) - warden (1.1.0) - rack (>= 1.0) webrat (0.7.2) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -164,4 +168,5 @@ DEPENDENCIES rdoc ruby-debug (>= 0.10.3) sqlite3-ruby + warden! webrat (= 0.7.2) diff --git a/devise.gemspec b/devise.gemspec index 58be5857..373b18cb 100644 --- a/devise.gemspec +++ b/devise.gemspec @@ -18,7 +18,6 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- test/*`.split("\n") s.require_paths = ["lib"] - s.add_dependency("warden", "~> 1.1") s.add_dependency("orm_adapter", "~> 0.0.3") s.add_dependency("bcrypt-ruby", "~> 3.0") s.add_dependency("railties", "~> 3.1")