mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,859 Commits
69 Branches
21 Tags
356 MiB
Ruby 48.6%
JavaScript 26.8%
TypeScript 13.2%
SCSS 7.7%
Haml 3.4%
Other 0.3%
 
 
 
 
 
 
Go to file
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
 		2018-06-15 20:51:39 +02:00
.circleci Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) 2018-05-11 11:51:07 +02:00
.github Multiple Issue templates (#7402) 2018-05-08 13:35:33 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
bin Port travis_retry for CI (#7379) 2018-05-06 10:55:50 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
docs
…
lib Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
log
…
nanobox [Nanobox] Tuning Update (#6660) 2018-03-06 21:59:35 +01:00
public Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
spec Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-14 06:17:24 +00:00
streaming Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
vendor/assets
…
.babelrc Remove debug option from Babel preset env (#6852) 2018-03-21 10:26:15 +01:00
.buildpacks
…
.codeclimate.yml fix RuboCop error (#7442) 2018-06-04 14:49:10 +02: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 branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
.env.test Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
.env.vagrant
…
.eslintignore
…
.eslintrc.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05: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 fix RuboCop error (#7442) 2018-06-04 14:49:10 +02:00
.ruby-version Update Ruby to version 2.4.4 (#6964) 2018-04-01 23:43:08 +02:00
.scss-lint.yml
…
.slugignore
…
.travis.yml ci: Hack around a Travis condition, I guess 2018-05-18 09:51:00 -05:00
.yarnclean
…
AUTHORS.md docs: Add AUTHORS file (#6685) 2018-03-09 13:11:43 +01:00
Aptfile
…
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
CONTRIBUTING.md Merge remote-tracking branch 'origin/master' into gs-master 2018-05-04 12:16:12 -05:00
Capfile
…
Dockerfile Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
LICENSE
…
Procfile
…
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
README.md Replace badge to CircleCI (#7216) 2018-04-21 21:56:40 +02:00
Rakefile
…
Vagrantfile Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
app.json
…
boxfile.yml [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
config.ru
…
docker-compose.yml Remove Puma pidfile before boot if container receives SIGTERM (#7052) 2018-05-25 18:50:31 +02:00
jest.config.js Removed glitch tests 2017-11-17 19:29:17 -08:00
package.json Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05: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
yarn.lock Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00: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?