luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-22 14:53:15 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
15500 commits 1 branch 0 tags 248 MiB
Ruby 62.3%
JavaScript 24%
SCSS 6.9%
Haml 5%
TypeScript 1.5%
Other 0.2%
Go to file
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
.circleci Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
.devcontainer Disable transpile to older iOS versions (#18462) 2022-05-20 04:39:05 +02:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
bin
chart Support STREAMING_API_BASE_URL in Helm Chart (#18408) 2022-05-14 10:03:44 +02:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +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-06-28 11:11:18 +02:00
log
nanobox
public Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
vendor
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks
.codeclimate.yml Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02: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 from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02: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
.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 Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
.ruby-version
.slugignore
.yarnclean
app.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
Aptfile Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
AUTHORS.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
babel.config.js
boxfile.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
Capfile
CHANGELOG.md Bump version to 3.5.3 (#18530) 2022-05-26 23:26:15 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic (#18643) 2022-06-15 16:35:36 +02:00
Dockerfile Update Dockerfile (#18717) 2022-06-27 09:02:48 +02:00
FEDERATION.md
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
ide-helper.js
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
LICENSE
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md Drop support for Ruby v2.5 and Node.js v12 (#18323) 2022-06-16 22:09:58 +02:00
scalingo.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
SECURITY.md Remove 3.3.x from supported versions in security policy (#18516) 2022-05-26 18:43:14 +02:00
stylelint.config.js Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +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?