-
Notifications
You must be signed in to change notification settings - Fork 183
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream commit triage #2384
Comments
Would you mind if I pinned this issue? And if you don't mind, could you stick to editing one issue rather than closing the older one and re-opening a new one? Thanks again for your work! |
Not at all!
Can do going forward! |
The next triage will be a bit delayed. I'm not doing well currently and I keep missing stuff. |
No worries, take care! |
I'm going to unpin the issue for now, but let me know if you ever feel like doing that again! Thank you again for your work! |
That thanks means a lot, thank you! |
The issue is that it will probably block all merges for a while. The easiest way forward is probably go give up and include the redesign including the weird string changes, but even that will take a lot of work. |
Yeah :/ |
The alternative is to have our own string identifiers for visibility options throughout the code base, it's doable but will increase code changes with upstream across the whole front-end and will prevent us from benefiting from upstream translations. |
Decided to do this one last time until that awful compose change is dealt with. Regarding the string identifiers: Yeah, I dunno. This just sucks. The extra info made renaming "unlisted" obsolete and the new description is even worse. That should've never been merged. But I'm not sure it's worth the overhead to keep the old text. However you decide to deal with that, I won't hold it against you. |
No guarantee of correctness. (Changes got quite interdependent...)
Checked commits up to: N/a
Can be ported:
Can be postponed:
Can be skipped:
Fixes:
The following command was used in a local copy of a fork of this repo to show commits needing triage:
git fetch vanilla && git log -p refs/remotes/upstream/main..refs/remotes/vanilla/main -- app/javascript/mastodon/ app/javascript/styles ':!app/javascript/mastodon/locales'
The
-p
can be omitted fromgit log
to see commits without changes.Remote
upstream
points to this repo andvanilla
to upstream repo.Adjust remotes as needed.
I currently don't have the energy to do this anymore and want to focus my remaining energy on my own fork.
The text was updated successfully, but these errors were encountered: