mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,967 Commits
69 Branches
20 Tags
372 MiB
Ruby 47.8%
JavaScript 30.9%
TypeScript 9.9%
SCSS 7.8%
Haml 3.3%
Other 0.3%
 
 
 
 
 
 
Go to file
Claire cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
  Upstream changed the fields returned by /api/v1/instance by adding a
  `configuration` field holding a lot of useful information making our
  `max_toot_chars` and `poll_limits` fields obsolete.
  Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
  No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
  MAX_CHARS which is defined differently in glitch-soc.
  Ported upstream changes.
 		2021-07-11 21:41:23 +02:00
.circleci Add Actions for check i18n (#16285) 2021-05-22 15:00:20 +02:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
app Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart helm: upgrade elasticsearch chart to 14 (#15767) 2021-03-12 05:39:09 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
dist Preload libjemalloc.so for long-running Ruby (#16462) 2021-07-05 19:16:35 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
log
…
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
vendor
…
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 2020-07-20 09:48:10 +02:00
.codeclimate.yml Bump rubocop from 1.8.1 to 1.9.1 (#15677) 2021-02-12 00:10:00 +09:00
.deepsource.toml Update .deepsource.toml (#15753) 2021-02-19 09:53:25 +01:00
.dockerignore Ignore git related files from docker build (#16282) 2021-05-22 17:43:07 +02:00
.editorconfig
…
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample Add environment variables to control custom emoji size limits 2021-04-26 11:22:22 +02:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 2020-06-15 01:57:06 +02:00
.eslintignore
…
.eslintrc.js Enable promise/catch-or-return allowFinally (#14289) 2020-07-11 23:51:22 +02:00
.foreman
…
.gitattributes
…
.gitignore helm: pin versions, commit lockfile (#15749) 2021-02-19 09:56:40 +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 Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
.ruby-version Use ruby-2.7.4 (#16481) 2021-07-10 01:29:27 +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 Bump version to 3.4.0 (#16239) 2021-05-16 23:55:07 +02:00
Aptfile Use libvpx >= 5 (#15591) 2021-01-22 10:09:40 +01:00
CHANGELOG.md Bump version to 3.4.1 (#16350) 2021-06-03 04:26:02 +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 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +02:00
Capfile
…
Dockerfile Use ruby-2.7.4 (#16481) 2021-07-10 01:29:27 +02:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
LICENSE
…
Procfile fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
README.md Change IRC channel to LiberaChat in README (#16279) 2021-05-24 05:16:45 +02:00
Rakefile Initial commit 2016-02-20 22:53:20 +01:00
SECURITY.md Fix security policy (#16248) 2021-05-16 23:50:16 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +02:00
app.json Stop using heroku-buildpack-nodejs (#14341) 2020-07-16 22:01:34 +02:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
boxfile.yml Fix to isolate the sidekiq process that runs the scheduler job (#15314) 2020-12-15 03:04:03 +01:00
config.ru
…
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml Update docker-compose.yml (#16489) 2021-07-11 12:57:31 +02:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
package.json Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
postcss.config.js
…
priv-config
…
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02: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?