T

David Yip 3d033a4687 Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml

2018-02-17 00:02:37 -06:00

.github

Move files for GitHub to .github directory (#5989 )

2017-12-12 15:10:12 +01:00

app

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

bin

…

config

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

docs

…

lib

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-11 18:17:11 +00:00

log

…

nanobox

…

public

…

spec

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

streaming

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 18:17:16 +00:00

vendor/assets

…

.babelrc

…

.buildpacks

…

.codeclimate.yml

Upgrade ESLint to version 4.x (#6276 )

2018-01-17 16:57:15 +01:00

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-11 04:10:16 +00:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

…

.ruby-version

Add support Ruby v2.5.0 (#6097 )

2018-01-19 20:53:30 +01:00

.scss-lint.yml

…

.slugignore

…

.travis.yml

Merge remote-tracking branch 'origin/merge-upstream'

2018-02-10 22:08:45 -06:00

.yarnclean

…

app.json

…

Aptfile

…

boxfile.yml

[Nanobox] Fix backups for file storage (#6483 )

2018-02-16 17:10:01 +01:00

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker_entrypoint.sh

dockerfile: Give more stack space to /sbin/tini.

2018-01-11 04:09:16 -06:00

docker-compose.yml

Full-text search for authorized statuses (#6423 )

2018-02-09 23:04:47 +01:00

Dockerfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-19 15:22:10 -06:00

Gemfile

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

Gemfile.lock

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

jest.config.js

…

LICENSE

…

package.json

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

…

scalingo.json

…

stack-fix.c

dockerfile: Give more stack space to /sbin/tini.

2018-01-11 04:09:16 -06:00

Vagrantfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

yarn.lock

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.