Merge remote-tracking branch 'upstream/develop' into registration-workflow

2020-12-17 09:04:43 -06:00 · 2020-12-17 09:04:43 -06:00 · 80891e83d8
commit 80891e83d8
parent 4999efad3f 8b8c317c0f
162 changed files with 8941 additions and 2668 deletions
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@ -60,7 +60,7 @@ defmodule Mix.Tasks.Pleroma.User do
      - admin: #{if(admin?, do: "true", else: "false")}
    """)

-    proceed? = assume_yes? or shell_yes?("Continue?")
+    proceed? = assume_yes? or shell_prompt("Continue?", "n") in ~w(Yn Y y)

    if proceed? do
      start_pleroma()