queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
queer.af mastodon fork
9703 commits 2 branches 0 tags 215 MiB
Ruby 44.8%
JavaScript 36.3%
SCSS 12.4%
Haml 3.8%
TypeScript 1.5%
Other 1.1%
Go to file
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
.dependabot Change dependabot update schedule from live to weekly (#10949) 2019-06-04 11:23:19 +02: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-06-24 15:02:59 +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-06-24 15:02:59 +02:00
db Fix old migrations failing because of new version of strong_migrations (#11018) 2019-06-09 22:55:28 +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-06-24 15:02:59 +02:00
log
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
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-06-24 15:02:59 +02:00
streaming Fix streaming server crashing when updating filters 2019-06-18 16:50:04 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
.env.test Do not test PAM authentication by default (#9027) 2018-10-20 07:32:26 +02:00
.env.vagrant update vagrant configs (#8706) 2018-09-16 14:49:15 -04:00
.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 require rubocop-rails in .rubocop.yml (#10974) 2019-06-06 12:31:48 +02:00
.ruby-version Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
app.json
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
babel.config.js New Crowdin translations (#11077) 2019-06-18 22:58:18 +02:00
boxfile.yml Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
Capfile
CHANGELOG.md Fix unconverted PRs in the changelog (#11155) 2019-06-22 18:13:52 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
crowdin.yml Update crowdin.yml 2019-06-12 15:11:00 +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: Remove dist-upgrade (#10822) 2019-05-26 22:26:45 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +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 Change translations badge in README to Crowdin (#11054) 2019-06-12 15:56:41 +02: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-06-19 18:36:16 +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?