From 296eefd1c2def4d61439832b4c6507bfac13d6f3 Mon Sep 17 00:00:00 2001
From: shlok007 <shlok.srivastava15@gmail.com>
Date: Sat, 21 Jan 2017 09:36:05 +0530
Subject: [PATCH] updated devise to 4.2.0

---
 Gemfile.lock                                    | 5 ++---
 app/controllers/registrations_controller.rb     | 4 ++--
 app/views/devise/shared/_openid_links.html.haml | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 145a969d..4f37bc18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,12 +150,11 @@ GEM
     delayed_job_active_record (4.1.0)
       activerecord (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)
-    devise (3.5.5)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise_ichain_authenticatable (0.3.1)
       devise (>= 2.2)
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 62292bf0..6302e701 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -22,11 +22,11 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:account_update) do |u|
+    devise_parameter_sanitizer.permit(:account_update) do |u|
       u.
           permit(:email, :password, :password_confirmation, :current_password, :username)
     end
-    devise_parameter_sanitizer.for(:sign_up) do |u|
+    devise_parameter_sanitizer.permit(:sign_up) do |u|
       u.
           permit(:email, :password, :password_confirmation, :name, :username)
     end
diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml
index 463d3410..f588ed86 100644
--- a/app/views/devise/shared/_openid_links.html.haml
+++ b/app/views/devise/shared/_openid_links.html.haml
@@ -1,7 +1,7 @@
 .text-center
   .btn-group.btn-group-lg
     - omniauth_configured.each do |provider|
-      = link_to user_omniauth_authorize_path(provider), class: "btn btn-success btn-lg",
+      = link_to "user_#{provider}_omniauth_authorize".to_sym, class: "btn btn-success btn-lg",
                                                         id: "omniauth-#{provider}",
                                                         title: "Your #{provider} login" do
         %i{:class => "fa fa-#{provider}"}