Commit 53c4fb92 authored by Lucas Braz Cunha's avatar Lucas Braz Cunha

Merge branch 'develop' into 'fix_email_env'

# Conflicts:
#   docker-compose.yml
parents 24490129 650d04f7
Pipeline #17169 passed with stages
in 3 minutes and 38 seconds
......@@ -39,7 +39,7 @@ class ResourceBooking < ApplicationRecord
Arel.sql("date(\"resource_bookings\".\"booking_start_time\")")
end
ransacker :date_end_booking do
Arel.sql("date(\"resource_bookings\".\"booking_en_time\")")
Arel.sql("date(\"resource_bookings\".\"booking_end_time\")")
end
private
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment