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

2018-08-11 15:45:42 +02:00
parent 741fb32bef 44680c46ed
commit 84a2587d44
83 changed files with 1184 additions and 293 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.first)
+      short_account_path(Account.local.where(suspended: false).first)
    else
      about_path
    end