rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
A fork of glitch-soc.
14,669 Commits
3 Branches
0 Tags
273 MiB
Ruby 47.6%
JavaScript 32.7%
TypeScript 8.2%
SCSS 7.7%
Haml 3.4%
Other 0.4%
 
 
 
 
 
 
Go to file
Claire aa832d623a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
 		2022-02-06 15:34:42 +01:00
.circleci Add more advanced migration tests (#17393) 2022-01-30 23:50:08 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart Update tootsuite/mastodon Docker tag to v3.4.6 (#17436) 2022-02-03 21:29:20 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-01-30 22:33:30 +01:00
dist Add ReadWritePaths directive to service files (#17178) 2021-12-22 04:34:12 +01:00
lib Forward-port version bump to 3.4.6 (#17434) 2022-02-03 14:21:38 +01:00
log
…
nanobox
…
public Merge branch 'main' into glitch-soc/merge-upstream 2022-02-01 20:59:28 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-01-07 19:51:47 +01:00
vendor
…
.buildpacks
…
.codeclimate.yml Exclude locale files from Code Climate (#16863) 2021-10-18 12:04:42 +02:00
.deepsource.toml Update .deepsource.toml (#15753) 2021-02-19 09:53:25 +01:00
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig
…
.env.nanobox Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287) 2022-01-23 15:50:41 +01:00
.env.production.sample Add optional hCaptcha support 2022-01-24 21:22:13 +01:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc (#16163) 2021-08-10 22:56:13 +02:00
.profile
…
.rspec
…
.rubocop.yml Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
.ruby-version Upgrade Ruby to 3.0.3 (#17038) 2021-11-24 20:29:05 +01:00
.sass-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
Aptfile Use libvpx >= 5 (#15591) 2021-01-22 10:09:40 +01:00
CHANGELOG.md Forward-port version bump to 3.4.6 (#17434) 2022-02-03 14:21:38 +01:00
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
Capfile
…
Dockerfile Bump NODE_VER to 16.13.2, to solve security issues (#17399) 2022-01-31 00:32:03 +01:00
FEDERATION.md Add FEDERATION.md (#17029) 2021-11-23 00:15:31 +01:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
LICENSE
…
Procfile
…
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
README.md Add line about using vagrant-hostsupdater in the Vagrant short guide (#17243) 2022-01-16 16:55:41 +01:00
Rakefile
…
SECURITY.md Fix security policy (#16248) 2021-05-16 23:50:16 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
app.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
boxfile.yml
…
config.ru
…
crowdin.yml Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085) 2021-12-01 19:03:35 +01:00
docker-compose.yml Add healthcheck for sidekiq (#17365) 2022-01-26 18:08:49 +01:00
ide-helper.js
…
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00
postcss.config.js
…
priv-config
…
scalingo.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-02-06 15:34:42 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?