tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
parent 5d12b63e79 bb9ca8a587
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/directories_controller.rb
View File

@@ -10,7 +10,7 @@ class DirectoriesController < ApplicationController
before_action :set_accounts
before_action :set_pack
skip_before_action :require_functional!
skip_before_action :require_functional!, unless: :whitelist_mode?
def index
render :index