diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
commit | 9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch) | |
tree | 0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /app/controllers/remote_follow_controller.rb | |
parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
parent | 49f57b55346f8e62d21a3c8bc63301038ecb796f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
Diffstat (limited to 'app/controllers/remote_follow_controller.rb')
-rw-r--r-- | app/controllers/remote_follow_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb index 46dd444a4..65dfa35db 100644 --- a/app/controllers/remote_follow_controller.rb +++ b/app/controllers/remote_follow_controller.rb @@ -30,7 +30,7 @@ class RemoteFollowController < ApplicationController end def session_params - { acct: session[:remote_follow] } + { acct: session[:remote_follow] || current_account&.username } end def set_pack |