diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
| commit | 24968d20a07d483cd36b4747bd1db8bd512002c2 (patch) | |
| tree | d306d08bc32edba292cf9aa85c3be8ba009c1b1c /app/controllers/home_controller.rb | |
| parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
| parent | b31b232edfcc7f04acf828bf6829ab716b290692 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
Diffstat (limited to 'app/controllers/home_controller.rb')
| -rw-r--r-- | app/controllers/home_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 3f9554ca0..a09aed801 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -61,7 +61,7 @@ class HomeController < ApplicationController end def default_redirect_path - if request.path.start_with?('/web') + if request.path.start_with?('/web') || whitelist_mode? new_user_session_path elsif single_user_mode? short_account_path(Account.local.without_suspended.where('id > 0').first) |