A glitchy but lovable microblogging server
Go to file
Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
2021-11-25 23:50:35 +01:00
.circleci
.github
app Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
bin
chart
config Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
dist
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
log
nanobox
public
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
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
.profile
.rspec
.rubocop.yml
.ruby-version
.sass-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml
Dockerfile
FEDERATION.md
Gemfile
Gemfile.lock
ide-helper.js
LICENSE
package.json
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
SECURITY.md
Vagrantfile
yarn.lock

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?