The Jubilife Global Terminal's glitch-soc Mastodon + modifications https://jubi.life
 
 
 
 
 
 
Go to file
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +01:00
.circleci Set BUNDLE_PATH in CircleCI (#13214) 2020-03-08 15:45:19 +01:00
.dependabot
.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 2020-03-08 19:38:53 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
dist Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
log
nanobox
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 2020-03-08 19:38:53 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-01-25 10:04:41 +01:00
vendor
.buildpacks
.codeclimate.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.dockerignore
.editorconfig
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample Add environment variable to specify extra data hosts 2020-02-06 12:15:15 +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
.eslintrc.js
.foreman
.gitattributes
.gitignore Use eslint cache (#12668) 2019-12-23 07:27:55 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Upgrade .nvmrc to Node.js 12 (#12906) 2020-01-21 12:42:13 +01:00
.profile
.rspec
.rubocop.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.ruby-version
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md
Aptfile
CHANGELOG.md Bump version to 3.1.2 (#13162) 2020-02-27 12:34:07 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
Capfile
Dockerfile Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture (#13081) 2020-02-16 12:54:57 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
LICENSE
Procfile
Procfile.dev
README.md 2019 -> 2020 (#12867) 2020-01-14 11:20:13 +01:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
app.json
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Correct the Nanobox deploy hooks for order and context (#12663) 2019-12-22 08:55:27 +01:00
config.ru
crowdin.yml
docker-compose.yml
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
postcss.config.js
priv-config
scalingo.json
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +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?