From 7b533272cfcba9a4b20196953f27a6e1a55d9b1f Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 15:46:51 -0700 Subject: [PATCH 1/3] remove over zealous required --- app/controllers/application_controller.rb | 2 +- app/views/devise/registrations/_change_password.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 01a72a2e..15792bb7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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] + return redirect_to root_path end @event = Event.where(id: event_id).first diff --git a/app/views/devise/registrations/_change_password.html.haml b/app/views/devise/registrations/_change_password.html.haml index 1b88cb7e..9b1e45c5 100644 --- a/app/views/devise/registrations/_change_password.html.haml +++ b/app/views/devise/registrations/_change_password.html.haml @@ -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 @@ -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 From 448ee2aa59256fc0614af4cf2d4bd5159a92af78 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 15:48:05 -0700 Subject: [PATCH 2/3] bump --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 25b22e06..ef40e4d0 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3.16 +1.3.17 From bece4cc4536ce7bb83edf116b1e609cdf7c5d542 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 15:52:04 -0700 Subject: [PATCH 3/3] rubocop --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 15792bb7..60e2918e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -39,7 +39,7 @@ def set_event event_not_found = lambda do |eid, flash| flash.now[:error] = "Event with id #{eid} was not found." - return redirect_to root_path + redirect_to root_path end @event = Event.where(id: event_id).first