aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2018-12-20 13:05:42 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2018-12-20 13:05:42 +0300
commit8adcd1e80f78cdacd245e9b6aacea4b05cb1a880 (patch)
treef35bb0896bf9675ad4454eadf5e8757d72f2c8a3
parent501ce34d7fbb74f91e8afcaa491625c5a0152597 (diff)
downloadpleroma-8adcd1e80f78cdacd245e9b6aacea4b05cb1a880.tar.gz
[#114] Removed flash messages rendering on redirects.
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 2b0f7135a..46dc9b12c 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -13,7 +13,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
require Logger
plug(:only_if_public_instance when action in [:public_timeline, :public_and_external_timeline])
- plug(:fetch_flash when action in [:confirm_email, :resend_confirmation_email])
action_fallback(:errors)
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
@@ -390,7 +389,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change),
{:ok, _} <- User.update_and_set_cache(changeset) do
conn
- |> put_flash(:info, "Email confirmed. Please sign in.")
|> redirect(to: "/")
end
end
@@ -401,7 +399,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email),
{:ok, _} <- User.try_send_confirmation_email(user) do
conn
- |> put_flash(:info, "Email confirmation has been sent.")
|> json_response(:no_content, "")
end
end