Sync up with the downstream changes

.haml-lint.yml

@@ -1,3 +1,5 @@
+inherits_from: .haml-lint_todo.yml
+
 linters:
   LineLength:
     max: 120

.haml-lint_todo.yml

@@ -0,0 +1,14 @@
+# This configuration was generated by
+# `haml-lint --auto-gen-config`
+# on 2024-06-23 11:39:09 +0000 using Haml-Lint version 0.53.0.
+# The point is for the user to remove these configuration records
+# one by one as the lints are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of Haml-Lint, may require this file to be generated again.
+
+linters:
+
+  # Offense count: 1
+  RuboCop:
+    exclude:
+      - "app/views/main/index.html.haml"

Gemfile

@@ -2,8 +2,6 @@
 
 source 'https://rubygems.org'
 
-ruby '3.2.3'
-
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem 'rails', '~> 7.1.3'
 

Gemfile.lock

@@ -448,8 +448,5 @@ DEPENDENCIES
   tzinfo-data
   web-console
 
-RUBY VERSION
-   ruby 3.2.2p53
-
 BUNDLED WITH
    2.4.10

app/helpers/application_helper.rb

@@ -12,9 +12,9 @@ def range_display(from, to)
     date += ' - '
 
     date += if from.to_date == to.to_date
-              local_time(to, '%H:%M')
+              local_time(to, '%H:%M %Z')
             else
-              local_time(to, :short)
+              local_time(to, '%d %b %H:%M %Z')
             end
 
     date

app/views/events/show.html.haml

@@ -36,8 +36,8 @@
       .col-auto
         %i.fas.fa-fw.fa-clock
       .col
-        %div= local_time(@event.starts_at, :long)
-        %div= local_time(@event.ends_at, :long)
+        %div= local_time(@event.starts_at, '%B %d, %Y %H:%M %Z')
+        %div= local_time(@event.ends_at, '%B %d, %Y %H:%M %Z')
     - if @event.schedule_recurrences.present?
       .row.g-2.mb-2
         .col-auto

app/views/main/index.html.haml

@@ -22,13 +22,13 @@
           %ul
             - tday_zero = index.beginning_of_day
             - tmrw_zero = (index + 1.day).beginning_of_day
-            - @event_occurrences.where('starts_at >= ?', tday_zero).where('starts_at < ?', tmrw_zero).find_each do |e|
+            - @event_occurrences.where('starts_at >= ?', tday_zero).where('starts_at < ?', tmrw_zero).each do |e|
               %li.p-0
                 - badge_cls = "badge text-bg-#{e.event.team.color} text-truncate w-100 text-decoration-none text-start"
                 = link_to(team_event_path(e.event.team, e.event),
                           class: badge_cls, title: e.event.name) do
                   = local_time(e.starts_at, :time)
                   %span.hidden-info
                     \-
-                    = local_time(e.ends_at, :time)
+                    = local_time(e.ends_at, '%H:%M %Z')
                   = e.event.name

config/locales/en.yml

@@ -41,7 +41,7 @@ en:
   close: 'Close'
   sign_up: 'Sign up'
   sign_up_to: "Sign up to %{provider}"
-  sign_in_to: "Log in with %{provider}"
+  sign_in_with: "Log in with %{provider}"
   or: 'or'
   username: 'Username'
   password: 'Password'

config/routes.rb

@@ -16,6 +16,10 @@
   resources :users, only: %i[index update], param: :username
 
   devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
+
+  devise_scope :user do
+    delete '/users/sign_out' => 'devise/sessions#destroy', as: :destroy_user_session
+  end
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 
   # Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.