From 06941ac7a28f80f0e5504e655a673938903a3cd0 Mon Sep 17 00:00:00 2001
From: Rodrigo Flores <rodrigo.flores@plataformatec.com.br>
Date: Thu, 16 Feb 2012 15:49:16 -0200
Subject: [PATCH] Updating gemfile to use the new warden version

---
 Gemfile                      |  1 -
 Gemfile.lock                 | 11 +++--------
 devise.gemspec               |  1 +
 gemfiles/Gemfile.rails-3.1.x |  1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

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