Mastodon (Freak U edition). Fork of https://github.com/glitch-soc/mastodon
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict caused because of minor code style change upstream, while glitch-soc
  has different code for handling variable maximum chars.
  Ported the change.
- `app/serializers/initial_state_serializer.rb`:
  Conflict because glitch-soc had two extra attributes where upstream added
  one.
  Added upstream's attribute.
2022-05-16 22:29:05 +02:00
.circleci Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
.devcontainer Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 15:02:56 +02:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02:00
bin
chart Support STREAMING_API_BASE_URL in Helm Chart (#18408) 2022-05-14 10:03:44 +02:00
config Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
dist Also compress SVG and ICO images in nginx (#17651) 2022-02-26 17:27:11 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
log
nanobox
public Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
spec Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-04-25 17:09:32 +02:00
vendor
.buildpacks
.codeclimate.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.deepsource.toml
.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 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00
.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
.prettierignore Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.prettierrc.js Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.profile
.rspec
.rubocop.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +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 Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Aptfile Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
CHANGELOG.md Bump version to 3.5.2 (#18295) 2022-05-04 00:57:42 +02: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.14.2 (#17825) 2022-03-19 09:24:26 +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-05-16 09:42:32 +02:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
LICENSE
Procfile
Procfile.dev
README.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Rakefile
SECURITY.md Add v3.5.x to SECURITY.md (#17998) 2022-04-08 20:18:20 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
app.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
babel.config.js
boxfile.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
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 Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
ide-helper.js
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02:00
postcss.config.js
priv-config
scalingo.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02: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?