Go to file

Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

.circleci

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-18 18:04:49 +02:00

.github

Adapt github issue template to glitch-soc

2018-08-19 16:56:42 +02:00

app

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

bin

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

config

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-22 20:56:32 +02:00

dist

Add nginx and systemd templates (#8770 )

2018-09-24 16:46:05 +02:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

log

…

nanobox

[Nanobox] Tuning Update (#6660 )

2018-03-06 21:59:35 +01:00

public

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00

spec

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

streaming

Add health endpoint to streaming API (#8441 )

2018-08-26 11:54:25 +02:00

vendor/assets

…

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

fix RuboCop error (#7442 )

2018-06-04 14:49:10 +02:00

.dockerignore

Add .bundle to .dockerignore (#7895 )

2018-06-26 20:33:29 +02:00

.editorconfig

…

.env.nanobox

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

2018-08-25 13:27:08 +02:00

.env.production.sample

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-26 14:23:24 +02:00

.env.test

Add parallel test processors (#7215 )

2018-04-21 21:36:22 +02:00

.env.vagrant

update vagrant configs (#8706 )

2018-09-16 14:49:15 -04:00

.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

Upgrade Node.js to v8.x on nvmrc (#8023 )

2018-07-15 12:29:17 +09:00

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

Move more tasks to tootctl (#8675 )

2018-09-14 17:42:22 +02:00

.ruby-version

Update Ruby to version 2.4.4 (#6964 )

2018-04-01 23:43:08 +02:00

.scss-lint.yml

…

.slugignore

…

.yarnclean

Reduce container size with clean yarn (#3506 )

2017-09-30 22:05:24 +02:00

app.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

using mailto scheme in AUTHORS.md (#8663 )

2018-09-10 02:01:03 +02:00

babel.config.js

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02: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

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 12:16:12 -05:00

docker-compose.yml

Misc. typos (#8694 )

2018-09-14 00:53:09 +02:00

Dockerfile

Revert "Updated ruby/node images" (#8712 )

2018-09-17 14:55:48 +02:00

Gemfile

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

Gemfile.lock

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

jest.config.js

Removed glitch tests

2017-11-17 19:29:17 -08:00

LICENSE

…

package.json

Revert Font Awesome 5 upgrade (#8810 )

2018-09-28 02:11:14 +02:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

2018-03-12 03:50:40 +01:00

Rakefile

…

README.md

Fix build status link in README.md

2018-09-28 21:18:04 +02:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

stack-fix.c

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

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

Vagrantfile

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

yarn.lock

Revert Font Awesome 5 upgrade (#8810 )

2018-09-28 02:11:14 +02: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.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%