diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-30 20:01:04 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-30 20:01:04 +0000 |
| commit | 87fe31fb5c3970d92fb8a6bcc38ca98c096d8808 (patch) | |
| tree | cb3ee8ef98adf2af11bd350fd5faa7d9f022cb89 /lib | |
| parent | 16b7b494ba855282df74de5498819412969da561 (diff) | |
| parent | d9bf2c58df0a828901ab7cc66c5fd35d58a485ec (diff) | |
| download | pleroma-87fe31fb5c3970d92fb8a6bcc38ca98c096d8808.tar.gz pleroma-87fe31fb5c3970d92fb8a6bcc38ca98c096d8808.zip | |
Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index fe5d022f5..4c97904b6 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -100,7 +100,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do def create(%{assigns: %{app: app}, body_params: params} = conn, _params) do with :ok <- validate_email_param(params), :ok <- TwitterAPI.validate_captcha(app, params), - {:ok, user} <- TwitterAPI.register_user(params, need_confirmation: true), + {:ok, user} <- TwitterAPI.register_user(params), {:ok, token} <- Token.create_token(app, user, %{scopes: app.scopes}) do json(conn, OAuthView.render("token.json", %{user: user, token: token})) else |