moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remove-unused-settings' into 'develop' 

Remove unused settings

See merge request pleroma/pleroma!297
This commit is contained in:
kaniini 2018-08-26 20:16:12 +00:00
parent ffa552f1a4 946a0769c4
commit d802903c15
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.exs
View File

@ -72,10 +72,6 @@
redirect_root_no_login: "/main/all", redirect_root_no_login: "/main/all",
redirect_root_login: "/main/friends", redirect_root_login: "/main/friends",
show_instance_panel: true, show_instance_panel: true,
show_who_to_follow_panel: false,
who_to_follow_provider:
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
scope_options_enabled: false, scope_options_enabled: false,
collapse_message_with_subject: false collapse_message_with_subject: false

3
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -172,10 +172,7 @@ def config(conn, _params) do
redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login), redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
chatDisabled: !Keyword.get(@instance_chat, :enabled), chatDisabled: !Keyword.get(@instance_chat, :enabled),
showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel), showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled), 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),
collapseMessageWithSubject: collapseMessageWithSubject:
Keyword.get(@instance_fe, :collapse_message_with_subject) Keyword.get(@instance_fe, :collapse_message_with_subject)
} }