logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: d802903c15f52e548ce070f30c7be3e79e748558
parent: ffa552f1a41c530a7eff25d27cf0a82e710067b6
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 26 Aug 2018 20:16:12 +0000

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

Remove unused settings

See merge request pleroma/pleroma!297

Diffstat:

Mconfig/config.exs4----
Mlib/pleroma/web/twitter_api/controllers/util_controller.ex3---
2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/config/config.exs b/config/config.exs @@ -72,10 +72,6 @@ config :pleroma, :fe, redirect_root_no_login: "/main/all", redirect_root_login: "/main/friends", 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, collapse_message_with_subject: false diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -172,10 +172,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login), chatDisabled: !Keyword.get(@instance_chat, :enabled), 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), - whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider), - whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link), collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject) }