Skip to content

Commit

Permalink
Merge pull request #297 from fnf-org/mfl/fix-account-change
Browse files Browse the repository at this point in the history
Mfl/fix account change
  • Loading branch information
beingmattlevy authored Sep 6, 2024
2 parents 84615c2 + bece4cc commit 18245cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.16
1.3.17
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def set_event

event_not_found = lambda do |eid, flash|
flash.now[:error] = "Event with id #{eid} was not found."
raise ArgumentError, flash.now[:error]
redirect_to root_path
end

@event = Event.where(id: event_id).first
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/registrations/_change_password.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
%strong= "Password:"
%br
%normal.fst-italic.nowrap (6 characters minimum)
= f.password_field :password, autocomplete: "new-password", min_length: 6, required: true
= f.password_field :password, autocomplete: "new-password", min_length: 6

.col-7
= f.label :password_confirmation do
Expand All @@ -30,4 +30,4 @@
%normal.fst-italic.nowrap (6 characters minimum)
%br

%p= f.password_field :password_confirmation, autocomplete: "new-password", min_length: 6, required: true
%p= f.password_field :password_confirmation, autocomplete: "new-password", min_length: 6

0 comments on commit 18245cc

Please sign in to comment.