Mastodon (Freak U edition). Fork of https://github.com/glitch-soc/mastodon
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
bin Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
dist Cache error 410 responses in recommended nginx configuration (#10425) 2019-03-30 03:14:31 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
log
nanobox
public Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml Add `tootctl self-destruct` (#10367) 2019-03-28 17:56:25 +01:00
.ruby-version Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.scss-lint.yml
.slugignore
.yarnclean
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
Aptfile
CHANGELOG.md Bump version to 2.8.0rc3 (#10535) 2019-04-10 04:25:09 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-01-28 21:14:47 +01:00
Capfile
Dockerfile Re-organize Dockerfile to improve incremental builds. (#10212) 2019-03-08 16:12:48 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
LICENSE
Procfile
Procfile.dev
README.md Bumps copyright year in README.md to 2019 (#9939) 2019-01-28 22:57:42 +01:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
app.json
babel.config.js
boxfile.yml
config.ru
docker-compose.yml
package.json Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 2019-03-30 01:41:35 +01:00
postcss.config.js
priv-config
scalingo.json
yarn.lock Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 2019-03-30 01:41:35 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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?