Back

CONFLICT (content): Merge conflict in config/navigation.rb

ありゃーw

Keybase残してるとこがひっかかってるぽいなあ

/admin/roles が生えるのわね。ステージングで試してみる。

$ heroku run bash
~ $ tootctl accounts modify --help
Usage:
tootctl accounts modify USERNAME

Options:
[--role=ROLE]
[--email=EMAIL]
[--confirm], [--no-confirm]
[--enable], [--no-enable]
[--disable], [--no-disable]
[--disable-2fa], [--no-disable-2fa]
[--approve], [--no-approve]
[--reset-password], [--no-reset-password]

Description:
Modify a user account.

With the --role option, update the user's role.
:
~ $ tootctl accounts modify zunda --role Owner
OK

これでOwner: 0 users、Admin: 1 userだったのがOwner: 1 user、Admin: 0 usersになった。Permissionの数は減ったんだけど下位のものはもらってると思っていいのよねきっと。

\Master?/ \ますたー/

Merged mastodon/mastodon at 0665ba8a2307f7e894c99261864536d9998b2ca1.

Migrating to CreateUserRoles (20220611210335)
-- create_table(:user_roles)
-> 0.0201s

Migrating to AddRoleIdToUsers (20220611212541)
-- add_reference(:users, :role, {:foreign_key=>{:to_table=>"user_roles", :on_delete=>:nullify}, :index=>false})
-> 0.0107s
-- add_index(:users, :role_id, {:algorithm=>:concurrently, :where=>"role_id IS NOT NULL"})
-> 0.0080s

Migrating to MigrateRoles (20220617202502)
Migrating to MigrateSettingsToUserRoles (20220704024901)

$ heroku run bash

~ $ tootctl accounts modify zundan --role Owner
OK