Merge pull request 'Allow updating one's email address on the account settings page' (#127) from feature/103-update_email into master
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #127 Reviewed-by: greg <greg@noreply.kosmos.org>
This commit was merged in pull request #127.
This commit is contained in:
9
config/initializers/field_with_errors.rb
Normal file
9
config/initializers/field_with_errors.rb
Normal file
@@ -0,0 +1,9 @@
|
||||
ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
|
||||
if html_tag.match('class')
|
||||
html_tag.gsub(/class="(.*?)"/, 'class="\1 field_with_errors"').html_safe
|
||||
else
|
||||
parts = html_tag.split('>', 2)
|
||||
parts[0] += ' class="field_with_errors">'
|
||||
(parts[0] + parts[1]).html_safe
|
||||
end
|
||||
end
|
||||
@@ -3,7 +3,7 @@
|
||||
en:
|
||||
devise:
|
||||
confirmations:
|
||||
confirmed: "Thanks for confirming your email address! Your account has been activated."
|
||||
confirmed: "Thanks for confirming your email address."
|
||||
send_instructions: "You will receive an email with instructions for how to confirm your email address in a moment."
|
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
|
||||
failure:
|
||||
|
||||
@@ -30,6 +30,7 @@ Rails.application.routes.draw do
|
||||
|
||||
resources :settings, param: 'section', only: ['index', 'show', 'update'] do
|
||||
collection do
|
||||
post 'update_email'
|
||||
post 'reset_password'
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user