A glitchy but lovable microblogging server
Go to file
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
.github Move files for GitHub to .github directory (#5989) 2017-12-12 15:10:12 +01:00
app Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
bin Update dependencies for Ruby (2017-10-30) (#5566) 2017-10-31 12:22:32 +01:00
config Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
docs
lib Point to glitch-soc source and not tootsuite on the public page 2018-04-08 15:43:26 +02:00
log
nanobox [Nanobox] Tuning Update (#6660) 2018-03-06 21:59:35 +01:00
public Fix error 500 page 2018-03-16 22:31:20 +01:00
spec Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
streaming Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
vendor/assets
.babelrc Remove debug option from Babel preset env (#6852) 2018-03-21 10:26:15 +01:00
.buildpacks
.codeclimate.yml Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
.dockerignore Ignore elasticsearch directory (#7070) 2018-04-08 16:57:16 +09:00
.editorconfig
.env.nanobox [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
.env.production.sample Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
.env.test Provide default OTP_SECRET value for development environment (#6617) 2018-03-04 20:28:24 +01:00
.env.vagrant
.eslintignore
.eslintrc.yml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
.foreman
.gitattributes
.gitignore Ignore elasticsearch directory (#7070) 2018-04-08 16:57:16 +09:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version Update Ruby to version 2.4.4 (#6964) 2018-04-01 23:43:08 +02:00
.scss-lint.yml
.slugignore
.travis.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
.yarnclean Reduce container size with clean yarn (#3506) 2017-09-30 22:05:24 +02:00
app.json
Aptfile
AUTHORS.md docs: Add AUTHORS file (#6685) 2018-03-09 13:11:43 +01:00
boxfile.yml [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
Capfile
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
config.ru
CONTRIBUTING.md
docker-compose.yml Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662) 2018-03-07 01:57:31 +01:00
Dockerfile Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
Gemfile Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
Gemfile.lock Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
jest.config.js Removed glitch tests 2017-11-17 19:29:17 -08:00
LICENSE
package.json Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00
Procfile
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
Rakefile
README.md Add license info to README (#6583) 2018-03-11 15:12:23 +01:00
scalingo.json Missing OTP_SECRET in scalingo.json (#6917) 2018-03-26 12:47:34 +02:00
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 'origin/master' into gs-master 2018-04-04 13:56:58 -05: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?