gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
Michael Ball 2020-12-04 01:17:39 -08:00
commit 2892a56a1c
12 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base
Rails.logger.debug('IChain Record was not Unique!')
sign_out(current_user)
redirect_to root_path,
error: 'Your E-Mail adress is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
error: 'Your E-Mail address is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
end
rescue_from UserDisabled do