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

2019-05-15 17:11:40 +02:00
parent cd534830ad f4f22391b2
commit 6badf2d252
39 changed files with 271 additions and 155 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -64,7 +64,7 @@ class HomeController < ApplicationController
    if request.path.start_with?('/web')
      new_user_session_path
    elsif single_user_mode?
-      short_account_path(Account.local.where(suspended: false).first)
+      short_account_path(Account.local.without_suspended.first)
    else
      about_path
    end