luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 04:07:45 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
12905 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 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
.circleci
.github Exclude dependency updates other than direct dependencies (#14944) 2020-10-06 19:16:30 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
bin
chart Fix postrgres secret name for cronjob (#15072) 2020-11-02 06:16:51 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
vendor
.buildpacks
.codeclimate.yml Removed disabling comments for Style/MethodMissingSuper (#15014) 2020-10-20 09:13:39 +02:00
.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
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-10-26 15:48:16 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
ide-helper.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
SECURITY.md
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +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?