hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'config/fe-collapse-subject' into 'develop'

Browse source 
fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289
This commit is contained in:
kaniini 2018-08-24 18:27:43 +00:00
commit 9ded0ee1a5
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -175,7 +175,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider),
whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link)
whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link),
collapseMessageWithSubject:
Keyword.get(@instance_fe, :collapse_message_with_subject)
}
}
})