[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
#	mix.exs

diff --cc config/config.exs
index 2dc87a50ccf6b93622a5ce104e4b6eb9544601b2,dccf7b2637c21d6fa7e7fb6b6c221e8b6f12039b..604290544485a6f349471a94f4c8e98a9b75a819
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -378,24 -378,8 +378,26 @@@ config :pleroma, :ldap
    base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
    uid: System.get_env("LDAP_UID") || "cn"
  
 +oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
 +
 +ueberauth_providers =
 +  for strategy <- oauth_consumer_strategies do
 +    strategy_module_name = "Elixir.Ueberauth.Strategy.#{String.capitalize(strategy)}"
 +    strategy_module = String.to_atom(strategy_module_name)
 +    {String.to_atom(strategy), {strategy_module, [callback_params: ["state"]]}}
 +  end
 +
 +config :ueberauth,
 +       Ueberauth,
 +       base_path: "/oauth",
 +       providers: ueberauth_providers
 +
 +config :pleroma, :auth,
 +  oauth_consumer_strategies: oauth_consumer_strategies,
 +  oauth_consumer_enabled: oauth_consumer_strategies != []
 +
+ config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
+ 
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"

diff --cc lib/pleroma/web/router.ex
Simple merge