NeuromatchAcademy / mastodon

A glitchy but lovable microblogging server
https://glitch-soc.github.io/docs/
GNU Affero General Public License v3.0
7 stars 2 forks source link

Exclusive lists #12

Closed hobgoblina closed 1 year ago

hobgoblina commented 1 year ago

Cherry picked from https://github.com/mastodon/mastodon/pull/22048

Looks like one of the things glitch did to prevent upstream changes from breaking glitch functionality is they added the app/javascript/flavours/glitch directory. So I just added the changes in there instead of both places. :P

sneakers-the-rat commented 1 year ago

let's pull to dev bc it's been updated from upstream, and figure out how to write tests, this seems like a good feature to learn on I think

hobgoblina commented 1 year ago

sounds good! merged dev into this branch, can prolly chat about tests in discord

sneakers-the-rat commented 1 year ago

k i wasn't sure what would happen if i pushed just then but i did and now things are happening.

sneakers-the-rat commented 1 year ago

I approve of these commits

github-actions[bot] commented 1 year ago

This pull request has merge conflicts that must be resolved before it can be merged.

github-actions[bot] commented 1 year ago

This pull request has resolved merge conflicts and is ready for review.