Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
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.
This commit is contained in:
Thibaut Girka 2019-08-30 13:38:41 +02:00
commit 9044a2b051
52 changed files with 900 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/remote_interaction_controller.rb
View file

@ -33,7 +33,7 @@ class RemoteInteractionController < ApplicationController
end
def session_params
{ acct: session[:remote_follow] }
{ acct: session[:remote_follow] || current_account&.username }
end
def set_status