Closed polyamAdmin closed 3 weeks ago
:warning: Bumps ruby version to 3.3.3
Conflicts:
.rubocop_todo.yml
README.md
app/helpers/admin/action_logs_helper.rb
app/javascript/mastodon/locales/en-GB.json
app/javascript/mastodon/locales/en.json
app/views/admin/custom_emojis/index.html.haml
app/views/admin/reports/_actions.html.haml
Ported changes:
Postponed:
:warning: Bumps ruby version to 3.3.3
Conflicts:
.rubocop_todo.yml
Upstream removed some rules. Polyam-glitch had an extra ignore. Removed rules upstream did.README.md
Upstream changed ReadMe. Polyam-glitch has its own. Kept current.app/helpers/admin/action_logs_helper.rb
Upstream implemented a fix that was already in polyam-glitch. Matched code with upstream.app/javascript/mastodon/locales/en-GB.json
Upstream deleted string modified to say "toot". Deleted string as upstream did.app/javascript/mastodon/locales/en.json
Same as above. Additionally replaced "post" with "toot" in new strings.app/views/admin/custom_emojis/index.html.haml
Upstream changed a line close to additional polyam-glitch code. Ported upstream change.app/views/admin/reports/_actions.html.haml
Upstream made code style changes close to additional polyam-glitch elements. Ported change.Ported changes:
Postponed: