OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
Your self-hosted, globally interconnected microblogging community. https://joinmastodon.org/
9,388 Commits
128 Branches
269 Tags
917 MiB
Ruby 56.5%
JavaScript 28.3%
CSS 8.5%
HTML 6.5%
Dockerfile 0.1%
 
 
 
 
 
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
…
dist
…
lib
…
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
…
.gitignore
…
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
…
.profile
…
.rspec
…
.rubocop.yml
…
.ruby-version
…
.scss-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md
…
Aptfile
…
CHANGELOG.md
…
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md
…
Capfile
…
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
…
Procfile
…
Procfile.dev
…
README.md
…
Rakefile
…
Vagrantfile
…
app.json
…
babel.config.js
…
boxfile.yml
…
config.ru
…
docker-compose.yml
…
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
postcss.config.js
…
priv-config
…
scalingo.json
…
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?