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

Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
parent febcdad2e2 3babf8464b
commit 16ff7c5627
352 changed files with 7151 additions and 2269 deletions
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@ -8,6 +8,7 @@ class FollowingAccountsController < ApplicationController
  before_action :set_cache_headers

  skip_around_action :set_locale, if: -> { request.format == :json }
+  skip_before_action :require_functional!

  def index
    respond_to do |format|