queer.af mastodon fork
Go to file
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
.circleci Drop support for Ruby 2.4 from CircleCI (#12834) 2020-01-15 07:45:00 +01:00
.dependabot
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
streaming
vendor
.buildpacks
.codeclimate.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.dockerignore
.editorconfig
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.env.vagrant fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore Use eslint cache (#12668) 2019-12-23 07:27:55 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Upgrade .nvmrc to Node.js 12 (#12906) 2020-01-21 12:42:13 +01:00
.profile
.rspec
.rubocop.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.ruby-version Use Ruby 2.6.5 (#12049) 2019-10-02 04:54:32 +02:00
.sass-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Correct the Nanobox deploy hooks for order and context (#12663) 2019-12-22 08:55:27 +01:00
Capfile
CHANGELOG.md Update changelog for 3.0.1 (#12139) 2019-10-10 07:03:05 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
crowdin.yml
docker-compose.yml
Dockerfile Upgrade Node v12 in Dockerfile (#12703) 2019-12-30 07:41:40 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md 2019 -> 2020 (#12867) 2020-01-14 11:20:13 +01:00
scalingo.json
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00

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?