Go to file
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
.circleci
.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-23 19:01:30 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
log
nanobox
public
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-23 19:01:30 +02:00
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 2017-06-26 13:15:24 +02:00
.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 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
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
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02: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?