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 @@
- Enter the official merge date. Log and organisation page data will show the new organisation name from this date.
+ Enter the official merge date. Log and organisation page data will show the new organisation name from this date.
For example, 27 3 2024