Go to file
ThibG c1befd3909
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-12-12 16:10:58 +01:00
.circleci Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
.dependabot Change dependabot update schedule from live to weekly (#10949) 2019-06-04 11:23:19 +02:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
app Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
bin Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
dist Add TLS v1.3 support (#11603) 2019-08-30 07:42:50 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
log
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks Add ffmpeg buildpack for scalingo (#8500) 2018-08-29 01:21:23 +02:00
.codeclimate.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig
.env.nanobox Add an LDAP Mail attribute config (#12053) 2019-12-01 18:52:21 +01:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.env.vagrant fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02:00
.eslintignore Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.eslintrc.js Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
.foreman
.gitattributes
.gitignore Update .gitignore (#12287) 2019-11-04 12:54:08 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Upgrade Node.js to v8.x on nvmrc (#8023) 2018-07-15 12:29:17 +09:00
.profile
.rspec
.rubocop.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.ruby-version Use Ruby 2.6.5 (#12049) 2019-10-02 04:54:32 +02:00
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
CHANGELOG.md Update changelog for 3.0.1 (#12139) 2019-10-10 07:03:05 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
Capfile
Dockerfile Updated NodeJS in Dockerfile (#12492) 2019-11-29 17:03:20 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
LICENSE
Procfile Bind servers to 0.0.0.0 in Procfile (#11378) 2019-07-22 06:16:30 +02:00
Procfile.dev
README.md Edit introduction of README.md (#12372) 2019-11-13 13:54:47 +01:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
app.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
config.ru
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +02:00
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01: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?