luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-22 14:53:15 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
8879 commits 1 branch 0 tags 248 MiB
Ruby 62.3%
JavaScript 24%
SCSS 6.9%
Haml 5%
TypeScript 1.5%
Other 0.2%
Go to file
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01: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-03-18 18:03:27 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
streaming
vendor
.buildpacks
.codeclimate.yml
.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
.scss-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
docker-compose.yml
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +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?