diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /app/controllers/remote_follow_controller.rb | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'app/controllers/remote_follow_controller.rb')
| -rw-r--r-- | app/controllers/remote_follow_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb index 41c021781..128e80a67 100644 --- a/app/controllers/remote_follow_controller.rb +++ b/app/controllers/remote_follow_controller.rb @@ -6,6 +6,7 @@ class RemoteFollowController < ApplicationController before_action :set_account before_action :set_pack before_action :gone, if: :suspended_account? + before_action :set_body_classes def new @remote_follow = RemoteFollow.new(session_params) |