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

Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
2019-07-30 12:22:33 +02:00
parent f48c7689d2 b31b232edf
commit 24968d20a0
59 changed files with 779 additions and 221 deletions
--- a/app/controllers/remote_interaction_controller.rb
+++ b/app/controllers/remote_interaction_controller.rb
@@ -5,6 +5,7 @@ class RemoteInteractionController < ApplicationController

  layout 'modal'

+  before_action :authenticate_user!, if: :whitelist_mode?
  before_action :set_interaction_type
  before_action :set_status
  before_action :set_body_classes