From fb726dedf517054a54676c45cdf2fa20808127fa Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 13 Aug 2024 13:47:57 +0100
Subject: [PATCH] lint

---
 app/controllers/merge_requests_controller.rb | 3 ++-
 app/views/merge_requests/merge_date.html.erb | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 883a35003..9874cfffb 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -82,7 +82,7 @@ private
       :requesting_organisation_id,
       :status,
       :absorbing_organisation_id,
-      :merge_date
+      :merge_date,
     )
 
     merge_params[:requesting_organisation_id] = current_user.organisation.id
@@ -102,6 +102,7 @@ private
       year = merge_request_params["merge_date(1i)"]
 
       return @merge_request.errors.add(:merge_date, :blank) if [day, month, year].all?(&:blank?)
+
       if [day, month, year].none?(&:blank?) && Date.valid_date?(year.to_i, month.to_i, day.to_i)
         merge_request_params["merge_date"] = Time.zone.local(year.to_i, month.to_i, day.to_i)
       else
diff --git a/app/views/merge_requests/merge_date.html.erb b/app/views/merge_requests/merge_date.html.erb
index 0a36a6bdd..6766cb552 100644
--- a/app/views/merge_requests/merge_date.html.erb
+++ b/app/views/merge_requests/merge_date.html.erb
@@ -10,10 +10,10 @@
 
       <h2 class="govuk-heading-l">What is the merge date?</h2>
       <p class="govuk-hint">
-        Enter the official merge date. Log and organisation page data will show the new organisation name from this date. <br/><br/>
+        Enter the official merge date. Log and organisation page data will show the new organisation name from this date. <br><br>
         For example, 27 3 2024</p>
       <%= f.govuk_date_field :merge_date,
-        legend: {hidden: true},
+        legend: { hidden: true },
         width: 20 do %>
       <% end %>
       <%= f.hidden_field :page, value: "merge_date" %>
@@ -21,4 +21,4 @@
       <%= f.govuk_submit %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>