Open clarfonthey opened 5 years ago
I think we should wait with merging ANY upstream patches, until we've made proper decisions about where we're going.
We do want to take a different path, so I don't want us to keep just merging upstream all the time, when we actually want to change and improve things as well. If we aren't making sure we want everything that upstream is offering at that specific release.
@mal0ki I agree, but right now we don't really have the bandwidth to decide what we can do. This includes fixes which I'd rather not ignore.
…but also, part of having review before merging is commenting on these issues, so, we should discuss it at the following meeting.
How's this: we put each file change into a category and decide which categories we want to include now and which ones we want more time to review?
For example, right now most changes fall into one of these categories:
For example, it seems safe to allow 1 and 2 immediately (maybe review the translations that we can). We can decide if we want to support features 3 and 4. That will then reduce the changes enough to help us review whatever is left in 5.
Note to self: update this to be 2.9.3 instead.
Seems like there's conflicts with the yarn.lock
file. Would that be resolved by updating to 2.9.3 or some other way?
Yeah, I was going to rebase myself.
hi, will there still be a 2.9.3 update now that 3.0 is out?
@mthld Yes, there will be. 0.2.0
will be based off of 2.9.3
and then 0.3.0
will be based on 3.0
.
Note: there was a lot of difference between the translations for Spanish between the upstream Mastodon and ours (unsurprisingly, after #86) and these are going to need review before merge. Additionally, I'm torn on whether we should release this as 0.1.1 or 0.2.0 because although Mastodon only bumped the patch version, this includes new features.
This will block whatever our next release is, though.