From e91418436a17e13e09c2ad2a9eff13ce7e80946e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Nov 2022 16:35:21 +0100
Subject: [PATCH] Fix mastodon:setup not setting the admin's role properly
(#19670)
* Fix mastodon:setup not setting the admin's role properly
* Set contact username when creating admin account in mastodon:setup
---
lib/tasks/mastodon.rake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 0ccfc9f29f..80e1dcf520 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -433,9 +433,12 @@ namespace :mastodon do
password = SecureRandom.hex(16)
- user = User.new(admin: true, email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true)
+ owner_role = UserRole.find_by(name: 'Owner')
+ user = User.new(email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true, role: owner_role)
user.save(validate: false)
+ Setting.site_contact_username = username
+
prompt.ok "You can login with the password: #{password}"
prompt.warn 'You can change your password once you login.'
end
--
GitLab