Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 8c754cef355f9223cfc178376e476f0ae7367ecd..28867ed4c8e86405d8cf2f03064f56d0f263fb42 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -35,6 +35,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.
 config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
   filters: [],
+  link_name: true,
   proxy_remote: false,
   proxy_opts: [
     redirect_on_failure: false,
@@ -369,11 +370,15 @@ config :auto_linker,
     rel: false
   ]
 
+config :pleroma, :auth, oauth_consumer_enabled: false
+
 config :ueberauth,
        Ueberauth,
        base_path: "/oauth",
        providers: [
-         twitter: {Ueberauth.Strategy.Twitter, []}
+         twitter:
+           {Ueberauth.Strategy.Twitter,
+            [callback_params: ~w[client_id redirect_uri scope scopes]]}
        ]
 
 config :ueberauth, Ueberauth.Strategy.Twitter.OAuth,