mirrors/retrospring
1
0
Fork 0
mirror of https://github.com/Retrospring/retrospring.git synced 2024-11-20 16:09:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for devise 4.x

Browse source
This commit is contained in:
Georg Gadinger 2019-03-29 22:37:10 +01:00
parent b602edafa3
commit d47991f379
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -26,7 +26,7 @@ gem 'will_paginate'
gem 'will_paginate-bootstrap' gem 'will_paginate-bootstrap'
gem 'devise', '~> 4.0' gem 'devise', '~> 4.0'
gem 'devise-i18n' gem 'devise-i18n'
gem 'devise-async' # TODO: bring this to 1.0 after rails5 upgrade gem 'devise-async', git: "https://github.com/mhfs/devise-async.git", ref: "devise-4.x" # TODO: bring this to 1.0 after rails5 upgrade
gem 'bootstrap_form' gem 'bootstrap_form'
gem 'font-kit-rails' gem 'font-kit-rails'
gem 'nprogress-rails' gem 'nprogress-rails'

12
Gemfile.lock
View file

@ -1,3 +1,11 @@
GIT
remote: https://github.com/mhfs/devise-async.git
revision: 177f6363a002f7ff28f1d289c8cab7ad8d9cb8c5
ref: devise-4.x
specs:
devise-async (0.10.2)
devise (>= 4.0)
GIT GIT
remote: https://github.com/retrospring/questiongenerator.git remote: https://github.com/retrospring/questiongenerator.git
revision: c5f8362ff769425d42a94b3a611731eadaa5e0ca revision: c5f8362ff769425d42a94b3a611731eadaa5e0ca
@ -115,8 +123,6 @@ GEM
railties (>= 4.1.0, < 6.0) railties (>= 4.1.0, < 6.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-async (0.7.0)
devise (>= 2.2)
devise-i18n (1.1.2) devise-i18n (1.1.2)
diff-lcs (1.3) diff-lcs (1.3)
docile (1.1.5) docile (1.1.5)
@ -637,7 +643,7 @@ DEPENDENCIES
database_cleaner database_cleaner
delayed_paperclip delayed_paperclip
devise (~> 4.0) devise (~> 4.0)
devise-async devise-async!
devise-i18n devise-i18n
factory_girl_rails factory_girl_rails
fake_email_validator fake_email_validator

6
app/controllers/application_controller.rb
View file

@ -55,8 +55,8 @@ class ApplicationController < ActionController::Base
protected protected
def configure_permitted_parameters def configure_permitted_parameters
devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:screen_name, :email, :password, :password_confirmation, :remember_me) } devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(:screen_name, :email, :password, :password_confirmation, :remember_me) }
devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:login, :screen_name, :email, :password, :remember_me) } devise_parameter_sanitizer.permit(:sign_in) { |u| u.permit(:login, :screen_name, :email, :password, :remember_me) }
devise_parameter_sanitizer.for(:account_update) { |u| u.permit(:screen_name, :email, :password, :password_confirmation, :current_password) } devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(:screen_name, :email, :password, :password_confirmation, :current_password) }
end end
end end