diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-05-16 12:54:06 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-05-16 12:54:06 +0700 |
| commit | 9d14214eb921b0900b16d018d60c899a1b5d9154 (patch) | |
| tree | 1e1b5d3f14b1f0eaab72f3033b59335f5cf9e475 | |
| parent | aa11fa4864bf6ebdd4acfdba837675abbdcffc83 (diff) | |
| parent | a2771869a3b9851edea4961314c7944f3823f754 (diff) | |
| download | pleroma-9d14214eb921b0900b16d018d60c899a1b5d9154.tar.gz pleroma-9d14214eb921b0900b16d018d60c899a1b5d9154.zip | |
Merge branch 'develop' into feature/890-add-report-uri
| -rw-r--r-- | docs/api/admin_api.md | 8 | ||||
| -rw-r--r-- | docs/installation/debian_based_en.md | 3 | ||||
| -rw-r--r-- | docs/installation/debian_based_jp.md | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/federator/publisher.ex | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 75fa2ee83..59578f8d1 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -106,15 +106,15 @@ Authentication is required and the user must be an admin. - Method: `PUT` - Params: - - `nickname` - - `tags` + - `nicknames` (array) + - `tags` (array) ### Untag a list of users - Method: `DELETE` - Params: - - `nickname` - - `tags` + - `nicknames` (array) + - `tags` (array) ## `/api/pleroma/admin/users/:nickname/permission_group` diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md index 9613a329b..9c0ef92d4 100644 --- a/docs/installation/debian_based_en.md +++ b/docs/installation/debian_based_en.md @@ -12,6 +12,7 @@ This guide will assume you are on Debian Stretch. This guide should also work wi * `erlang-tools` * `erlang-parsetools` * `erlang-eldap`, if you want to enable ldap authenticator +* `erlang-ssh` * `erlang-xmerl` * `git` * `build-essential` @@ -49,7 +50,7 @@ sudo dpkg -i /tmp/erlang-solutions_1.0_all.deb ```shell sudo apt update -sudo apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools +sudo apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh ``` ### Install PleromaBE diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md index ac5dcaaee..41cce6792 100644 --- a/docs/installation/debian_based_jp.md +++ b/docs/installation/debian_based_jp.md @@ -14,6 +14,7 @@ - erlang-dev - erlang-tools - erlang-parsetools +- erlang-ssh - erlang-xmerl (Jessieではバックポートからインストールすること！) - git - build-essential @@ -44,7 +45,7 @@ wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb * ElixirとErlangをインストールします、 ``` -apt update && apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools +apt update && apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh ``` ### Pleroma BE (バックエンド) をインストールします diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex index 916bcdcba..fb4e8548d 100644 --- a/lib/pleroma/web/federator/publisher.ex +++ b/lib/pleroma/web/federator/publisher.ex @@ -31,7 +31,7 @@ defmodule Pleroma.Web.Federator.Publisher do """ @spec enqueue_one(module(), Map.t()) :: :ok def enqueue_one(module, %{} = params), - do: PleromaJobQueue.enqueue(:federation_outgoing, __MODULE__, [:publish_one, module, params]) + do: PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:publish_one, module, params]) @spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()} def perform(:publish_one, module, params) do |