From a638c21e76050d69f8fda39cd1d055db728d2e96 Mon Sep 17 00:00:00 2001
From: Lucas Mazza <lucas.mazza@plataformatec.com.br>
Date: Wed, 20 Aug 2014 18:12:57 -0300
Subject: [PATCH] Add responders as a Devise dependency.

---
 devise.gemspec                   |   1 +
 gemfiles/Gemfile.rails-head      |   1 -
 gemfiles/Gemfile.rails-head.lock | 107 +++++++++++++++----------------
 lib/devise.rb                    |   1 +
 4 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/devise.gemspec b/devise.gemspec
index 7f95d8a6..73b81075 100644
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency("bcrypt", "~> 3.0")
   s.add_dependency("thread_safe", "~> 0.1")
   s.add_dependency("railties", ">= 3.2.6", "< 5")
+  s.add_dependency("responders")
 end
diff --git a/gemfiles/Gemfile.rails-head b/gemfiles/Gemfile.rails-head
index 5aee897b..f4b9bd23 100644
--- a/gemfiles/Gemfile.rails-head
+++ b/gemfiles/Gemfile.rails-head
@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec path: '..'
 
 gem "rails", "4.2.0.beta1"
-gem "responders", "~> 2.0"
 gem "omniauth", "~> 1.2.0"
 gem "omniauth-oauth2", "~> 1.1.0"
 gem "rdoc"
diff --git a/gemfiles/Gemfile.rails-head.lock b/gemfiles/Gemfile.rails-head.lock
index 1d75f576..ab10f873 100644
--- a/gemfiles/Gemfile.rails-head.lock
+++ b/gemfiles/Gemfile.rails-head.lock
@@ -9,60 +9,6 @@ GIT
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
 
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 78728af2c9bba23ac96c8e78666102f58e6c890d
-  specs:
-    actionmailer (4.2.0.alpha)
-      actionpack (= 4.2.0.alpha)
-      actionview (= 4.2.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionpack (4.2.0.alpha)
-      actionview (= 4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionview (4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    activejob (4.2.0.alpha)
-      globalid (>= 0.2.3)
-    activemodel (4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      builder (~> 3.1)
-    activerecord (4.2.0.alpha)
-      activemodel (= 4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.alpha)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    rails (4.2.0.alpha)
-      actionmailer (= 4.2.0.alpha)
-      actionpack (= 4.2.0.alpha)
-      actionview (= 4.2.0.alpha)
-      activejob (= 4.2.0.alpha)
-      activemodel (= 4.2.0.alpha)
-      activerecord (= 4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.alpha)
-      sprockets-rails (~> 3.0.0.beta1)
-    railties (4.2.0.alpha)
-      actionpack (= 4.2.0.alpha)
-      activesupport (= 4.2.0.alpha)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
 PATH
   remote: ..
   specs:
@@ -70,12 +16,46 @@ PATH
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    actionpack (4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      rack (~> 1.6.0.beta)
+      rack-test (~> 0.6.2)
+      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    actionview (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    activejob (4.2.0.beta1)
+      globalid (>= 0.2.3)
+    activemodel (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      builder (~> 3.1)
+    activerecord (4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      arel (>= 6.0.0.beta1, < 6.1)
+    activesupport (4.2.0.beta1)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     arel (6.0.0.beta1)
     bcrypt (3.1.7)
     bson (2.3.0)
@@ -136,12 +116,28 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
+    rails (4.2.0.beta1)
+      actionmailer (= 4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activejob (= 4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activerecord (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.0.beta1)
+      sprockets-rails (~> 3.0.0.beta1)
     rails-deprecated_sanitizer (1.0.2)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.2)
       activesupport
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
+    railties (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
@@ -184,8 +180,7 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-oauth2 (~> 1.1.0)
   omniauth-openid (~> 1.0.1)
-  rails!
+  rails (= 4.2.0.beta1)
   rdoc
-  responders (~> 2.0)
   sqlite3
   webrat (= 0.7.3)
diff --git a/lib/devise.rb b/lib/devise.rb
index 2b99d923..95e2f981 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -4,6 +4,7 @@ require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
 require 'securerandom'
+require 'responders'
 
 module Devise
   autoload :Delegator,          'devise/delegator'