Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
This commit is contained in:
Thibaut Girka 2019-07-30 12:22:33 +02:00
commit 24968d20a0
59 changed files with 779 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/home_controller.rb
View file

@ -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)