Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop: (87 commits)
  Add a gopher url port config option
  modify the migrations to use naive_datetime_usec
  Fix filter migration
  Fix migration timestamp type
  Ecto 3.0.5 migration
  Update frontend
  Format
  Use ILIKE to search users
  transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
  user: properly cope with actors which do not declare a followers collection
  transmogrifier: when determining followers collection URI, we may need to fetch the actor
  test: add test for list sanitization
  tests: add test for as:Public issues
  activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
  activitypub: transmogrifier: ensure as:Public activities are delivered to followers
  fix UploadTest to use new image_tmp.jpg
  used imageOptim to reduce size of image files
  Document additional pleroma changes to /api/v1/accounts/:id
  Check if the user has indeed not been federated with
  Added support for exclude_types, limit, and min_id in Mastodon notifications.
  ...

config/config.exs

@@ -8,8 +8,6 @@ use Mix.Config
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
 
-config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
-
 config :pleroma, Pleroma.Captcha,
   enabled: false,
   seconds_valid: 60,
@@ -34,7 +32,8 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.
 # Upload configuration
 config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
-  filters: [],
+  filters: [Pleroma.Upload.Filter.Dedupe],
+  link_name: true,
   proxy_remote: false,
   proxy_opts: [
     redirect_on_failure: false,
@@ -256,8 +255,6 @@ config :pleroma, :media_proxy,
 
 config :pleroma, :chat, enabled: false
 
-config :ecto, json_library: Jason
-
 config :phoenix, :format_encoders, json: Jason
 
 config :pleroma, :gopher,
@@ -353,6 +350,17 @@ config :auto_linker,
     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: [],
+  tls: System.get_env("LDAP_TLS") == "true",
+  tlsopts: [],
+  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"

config/test.exs

@@ -17,6 +17,8 @@ config :pleroma, Pleroma.Captcha,
 # Print only warnings and errors during test
 config :logger, level: :warn
 
+config :pleroma, Pleroma.Upload, filters: [], link_name: false
+
 config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
 
 config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test