diff options
| author | Lain Soykaf <lain@lain.com> | 2021-12-26 16:41:17 +0100 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2021-12-26 16:41:17 +0100 |
| commit | 6efbd088546d7b95126b3100bca57b41e9482211 (patch) | |
| tree | efc8663deebf8df648e2c3ccb657742ce102d823 /config | |
| parent | 4e98ba3c3a96548fe6d7fa8705898c660b788fea (diff) | |
| parent | 2e2fb5f8026a8d70f5d64dcc94f8253a5db24020 (diff) | |
| download | pleroma-6efbd088546d7b95126b3100bca57b41e9482211.tar.gz pleroma-6efbd088546d7b95126b3100bca57b41e9482211.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 681b49827..23c41eddd 100644 --- a/config/config.exs +++ b/config/config.exs @@ -139,6 +139,7 @@ config :pleroma, Pleroma.Web.Endpoint, ], protocol: "https", secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", + live_view: [signing_salt: "U5ELgdEwTD3n1+D5s0rY0AMg8/y1STxZ3Zvsl3bWh+oBcGrYdil0rXqPMRd3Glcq"], signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], pubsub_server: Pleroma.PubSub, @@ -253,7 +254,8 @@ config :pleroma, :instance, ] ], show_reactions: true, - password_reset_token_validity: 60 * 60 * 24 + password_reset_token_validity: 60 * 60 * 24, + profile_directory: true config :pleroma, :welcome, direct_message: [ diff --git a/config/description.exs b/config/description.exs index 1c8c3b4a0..517077acf 100644 --- a/config/description.exs +++ b/config/description.exs @@ -936,6 +936,11 @@ config :pleroma, :config_description, [ key: :show_reactions, type: :boolean, description: "Let favourites and emoji reactions be viewed through the API." + }, + %{ + key: :profile_directory, + type: :boolean, + description: "Enable profile directory." } ] }, |