146
edits
Upgrade Mastodon: Difference between revisions
m
→History: Deprecated Steps that were followed for Merging glitch + 4.2RC + our instance's features
| Line 17: | Line 17: | ||
** Any features that have passed all the tests, have no errors (including linting errors), received approval from at least 1 reviewer, and are ready to be merged should be merged from the feature branch to the dev-stable branch in a separate process. See [[Mastodon/Hacking]] for details on contributing custom features to dev-stable. | ** Any features that have passed all the tests, have no errors (including linting errors), received approval from at least 1 reviewer, and are ready to be merged should be merged from the feature branch to the dev-stable branch in a separate process. See [[Mastodon/Hacking]] for details on contributing custom features to dev-stable. | ||
==== History: | ==== History: Steps that were followed for Merging glitch + 4.2RC + our instance's features ==== | ||
all branches refer to those in [https://github.com/NeuromatchAcademy/mastodon NeuromatchAcademy/mastodon] unless specified otherwise. | all branches refer to those in [https://github.com/NeuromatchAcademy/mastodon NeuromatchAcademy/mastodon] unless specified otherwise. | ||