From 526449624014f7ec80f6f14570ef17d482019483 Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <Jehops@users.noreply.github.com>
Date: Wed, 6 Sep 2017 22:55:06 -0300
Subject: [PATCH] Use casecmp() instead of casecmp?() for now (#4832)
* Use casecmp() instead of casecmp?() for now
casecmp?() is only available in ruby 2.4.0. Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.
* Correctly check whether casecmp() returns 0
---
lib/tasks/mastodon.rake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 307bc240db..3c65ece4be 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -47,7 +47,7 @@ namespace :mastodon do
confirm = STDIN.gets.chomp
puts
- if confirm.casecmp?('y')
+ if confirm.casecmp('y').zero?
password = SecureRandom.hex
user = User.new(email: email, password: password, account_attributes: { username: username })
if user.save
@@ -289,13 +289,13 @@ namespace :mastodon do
puts 'Delete records and associated files from deprecated preview cards? [y/N]: '
confirm = STDIN.gets.chomp
- if confirm.casecmp?('y')
+ if confirm.casecmp('y').zero?
DeprecatedPreviewCard.in_batches.destroy_all
puts 'Drop deprecated preview cards table? [y/N]: '
confirm = STDIN.gets.chomp
- if confirm.casecmp?('y')
+ if confirm.casecmp('y').zero?
ActiveRecord::Migration.drop_table :deprecated_preview_cards
end
end
--
GitLab