Merge branch 'main' into glitch-soc/merge-upstream

2021-04-05 14:31:07 +02:00
parent 39b9a0619a 117f6638d0
commit c901ae77d4
21 changed files with 191 additions and 47 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -10,7 +10,7 @@ Rails.application.routes.draw do

  mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development?

-  health_check_routes
+  get 'health', to: 'health#show'

  authenticate :user, lambda { |u| u.admin? } do
    mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq