Merge pull request #1254 from shlok007/devise

Updated devise to 4.2.0
This commit is contained in:
Stella Rouzi 2017-03-01 13:29:44 +02:00 committed by GitHub
commit 8b5d6603af
3 changed files with 5 additions and 6 deletions

View file

@ -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)

View file

@ -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, :email_public)
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

View file

@ -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}"}