search

florence-social / mastodon-fork

Florence's fork of Mastodon
GNU Affero General Public License v3.0
138 stars 15 forks source link

Upgrade to Mastodon 2.9.2 #135

Open clarfonthey opened 5 years ago

clarfonthey commented 5 years ago

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.

mal0ki commented 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.

clarfonthey commented 5 years ago

@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.

clarfonthey commented 5 years ago

…but also, part of having review before merging is commenting on these issues, so, we should discuss it at the following meeting.

1011X commented 5 years ago

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:

  1. Internal API changes, dependency updates, tests, etc.
  2. Translations
  3. Support for audio file uploads
  4. Support for disabling accounts
  5. Other

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.

clarfonthey commented 4 years ago

Note to self: update this to be 2.9.3 instead.

1011X commented 4 years ago

Seems like there's conflicts with the yarn.lock file. Would that be resolved by updating to 2.9.3 or some other way?

clarfonthey commented 4 years ago

Yeah, I was going to rebase myself.

ghost commented 4 years ago

hi, will there still be a 2.9.3 update now that 3.0 is out?

clarfonthey commented 4 years ago

@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.