luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
9413 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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
.circleci Fix CircleCI 2019-01-02 15:36:59 +01:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +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-05-26 15:41:40 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +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-05-26 15:41:40 +02:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-05-24 15:23:52 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
.env.test
.env.vagrant
.eslintignore Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.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
app.json
Aptfile
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
babel.config.js Weblate translations (2019-04-10) (#10545) 2019-04-10 18:17:24 +02:00
boxfile.yml
Capfile
CHANGELOG.md Forward port version bumps to 2.8.3 and 2.8.4 (#10819) 2019-05-24 15:57:31 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
docker-compose.yml Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 2019-05-19 11:29:26 +02:00
Dockerfile Docker: Keep /var/lib/apt/ to keep apt working (#10830) 2019-05-25 23:20:28 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md Bumps copyright year in README.md to 2019 (#9939) 2019-01-28 22:57:42 +01:00
scalingo.json
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02: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?