Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
This commit is contained in:
Thibaut Girka 2020-06-24 15:33:41 +02:00
commit aae60a2366
27 changed files with 840 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -11,7 +11,7 @@ class AccountsController < ApplicationController
before_action :set_body_classes
skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
skip_before_action :require_functional!
skip_before_action :require_functional!, unless: :whitelist_mode?
def show
respond_to do |format|