Mirror of https://github.com/glitch-soc/mastodon
aaa9ec340b
Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. |
||
---|---|---|
.circleci | ||
.devcontainer | ||
.github | ||
app | ||
bin | ||
chart | ||
config | ||
db | ||
dist | ||
lib | ||
log | ||
nanobox | ||
public | ||
spec | ||
streaming | ||
vendor | ||
.buildpacks | ||
.codeclimate.yml | ||
.deepsource.toml | ||
.dockerignore | ||
.editorconfig | ||
.env.nanobox | ||
.env.production.sample | ||
.env.test | ||
.env.vagrant | ||
.eslintignore | ||
.eslintrc.js | ||
.foreman | ||
.gitattributes | ||
.gitignore | ||
.gitmodules | ||
.haml-lint.yml | ||
.nanoignore | ||
.nvmrc | ||
.prettierignore | ||
.prettierrc.js | ||
.profile | ||
.rspec | ||
.rubocop.yml | ||
.ruby-version | ||
.sass-lint.yml | ||
.slugignore | ||
.yarnclean | ||
AUTHORS.md | ||
Aptfile | ||
CHANGELOG.md | ||
CODE_OF_CONDUCT.md | ||
CONTRIBUTING.md | ||
Capfile | ||
Dockerfile | ||
FEDERATION.md | ||
Gemfile | ||
Gemfile.lock | ||
LICENSE | ||
Procfile | ||
Procfile.dev | ||
README.md | ||
Rakefile | ||
SECURITY.md | ||
Vagrantfile | ||
app.json | ||
babel.config.js | ||
boxfile.yml | ||
config.ru | ||
crowdin.yml | ||
docker-compose.yml | ||
ide-helper.js | ||
package.json | ||
postcss.config.js | ||
priv-config | ||
scalingo.json | ||
yarn.lock |
README.md
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.