diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 |
| commit | f3e8f5b1f208b10130c7123e68af1e38575f180b (patch) | |
| tree | 523d1f1cfa399f4ee6d841ba3098ecd87d8e67e7 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 5a4d55cf910f85b07f111972647a8b4410b5eb6b (diff) | |
| parent | a2be420f940fb8f181feeb9b0fb9759d433dcae1 (diff) | |
| download | pleroma-f3e8f5b1f208b10130c7123e68af1e38575f180b.tar.gz | |
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
Features/mastoapi/2.7.0 registration
Closes #773
See merge request pleroma/pleroma!1134
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 21e6c555a..3c5a70be9 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -440,7 +440,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do true <- user.local, true <- user.info.confirmation_pending, true <- user.info.confirmation_token == token, - info_change <- User.Info.confirmation_changeset(user.info, :confirmed), + info_change <- User.Info.confirmation_changeset(user.info, need_confirmation: false), changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change), {:ok, _} <- User.update_and_set_cache(changeset) do conn |