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

Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
parent 7423c0c130 298ee84488
commit bfeac6747a
49 changed files with 1970 additions and 232 deletions
--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@ -47,5 +47,6 @@ class RemoteFollowController < ApplicationController

  def set_body_classes
    @body_classes = 'modal-layout'
+    @hide_header  = true
  end
 end