Merge remote-tracking branch 'upstream/develop' into feature/openldap-support

diff --cc config/config.exs
index 28d93e08697e6b34bc6acf221606df4011b057a2,a620e74517c8f52f350e192d7ac80b2b66d46ad5..8544dcc0d8a599501d06f8b1bd50c3509881eab9
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -344,15 -345,16 +345,25 @@@ config :pleroma, Pleroma.Jobs
    federator_outgoing: [max_jobs: 50],
    mailer: [max_jobs: 10]
  
+ config :auto_linker,
+   opts: [
+     scheme: true,
+     extra: true,
+     class: false,
+     strip_prefix: false,
+     new_window: false,
+     rel: false
+   ]
+ 
 +config :pleroma, :ldap,
 +  enabled: System.get_env("LDAP_ENABLED") == "true",
 +  host: System.get_env("LDAP_HOST") || "localhost",
 +  port: String.to_integer(System.get_env("LDAP_PORT") || "389"),
 +  ssl: System.get_env("LDAP_SSL") == "true",
 +  sslopts: [],
 +  base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
 +  uid: System.get_env("LDAP_UID") || "cn"
 +
  # 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 docs/config.md
index a497fb4ca2a88ad3b2e204d5a05a2c356f9fe5d9,d1bf2a6f461f755c3828a8486de51f0c162b2091..d7349d54f0a6189bdce10300b5a0accb70eb8e47
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -301,12 -301,28 +301,38 @@@ For each pool, the options are
  * `max_connections` - how much connections a pool can hold
  * `timeout` - retention duration for connections
  
+ ## :auto_linker
+ 
+ Configuration for the `auto_linker` library:
+ 
+ * `class: "auto-linker"` - specify the class to be added to the generated link. false to clear
+ * `rel: "noopener noreferrer"` - override the rel attribute. false to clear
+ * `new_window: true` - set to false to remove `target='_blank'` attribute
+ * `scheme: false` - Set to true to link urls with schema `http://google.com`
+ * `truncate: false` - Set to a number to truncate urls longer then the number. Truncated urls will end in `..`
+ * `strip_prefix: true` - Strip the scheme prefix
+ * `extra: false` - link urls with rarely used schemes (magnet, ipfs, irc, etc.)
+ 
+ Example:
+ 
+ ```exs
+ config :auto_linker,
+   opts: [
+     scheme: true,
+     extra: true,
+     class: false,
+     strip_prefix: false,
+     new_window: false,
+     rel: false
+   ]
+ ```
++
 +## :ldap
 +
 +* `enabled`: enables LDAP authentication
 +* `host`: LDAP server hostname
 +* `port`: LDAP port, e.g. 389 or 636
 +* `ssl`: true to use SSL
 +* `sslopts`: additional SSL options
 +* `base`: LDAP base, e.g. "dc=example,dc=com"
 +* `uid`: attribute type to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"

diff --cc lib/pleroma/web/oauth/oauth_controller.ex
Simple merge