Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
This commit is contained in:
commit
e6c3d3c744
5 files changed
+51
-8
No files matched your search
@@ -142,6 +142,7 @@ namespace :mastodon do
|
||||
rescue => e
|
||||
prompt.error 'Redis connection could not be established with this configuration, try again.'
|
||||
prompt.error e.message
|
||||
|
||||
unless prompt.yes?('Try again?')
|
||||
return prompt.warn 'Nothing saved. Bye!' unless prompt.yes?('Continue anyway?')
|
||||
|
||||
@@ -432,6 +433,7 @@ namespace :mastodon do
|
||||
rescue => e
|
||||
prompt.error 'E-mail could not be sent with this configuration, try again.'
|
||||
prompt.error e.message
|
||||
|
||||
unless prompt.yes?('Try again?')
|
||||
return prompt.warn 'Nothing saved. Bye!' unless prompt.yes?('Continue anyway?')
|
||||
|
||||
|
||||
Reference in new issue
Block a user