luna
/
mastodon
mirror of https://github.com/lunaisnotaboy/mastodon.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
17,295 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 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
 		2023-03-05 20:46:56 +01:00
.circleci Move db migration CI to GitHub Actions (#23624) 2023-02-19 07:06:34 +01:00
.devcontainer Updates dev container and adds doc for getting started with GitHub Codespaces (#23872) 2023-03-05 00:35:00 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
bin
…
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
dist Fix nginx location matching (#20198) 2022-11-09 04:12:57 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
log
…
public Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
vendor
…
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks
…
.bundler-audit.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
.codeclimate.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
.dockerignore
…
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
.foreman
…
.gitattributes
…
.gitignore helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
.prettierignore Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
.prettierrc.js Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.profile
…
.rspec
…
.rubocop.yml Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
.rubocop_todo.yml Disable Style/SymbolArray (#23921) 2023-03-03 22:55:43 +01:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Upgrade to Ruby 3.2 (#22928) 2023-02-15 08:30:27 +01:00
.slugignore
…
.yarnclean
…
AUTHORS.md Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
Aptfile Remove packages that are provided by Heroku stacks (#19836) 2022-12-15 18:55:29 +01:00
CHANGELOG.md Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
Capfile Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
Dockerfile Upgrade to Ruby 3.2 (#22928) 2023-02-15 08:30:27 +01:00
FEDERATION.md
…
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
LICENSE
…
Procfile
…
Procfile.dev
…
README.md Updates dev container and adds doc for getting started with GitHub Codespaces (#23872) 2023-03-05 00:35:00 +01:00
Rakefile
…
SECURITY.md Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
babel.config.js
…
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
crowdin-glitch.yml Add crowdin configuration file (#2030) 2022-12-21 22:13:22 +01:00
crowdin.yml
…
docker-compose.yml Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
ide-helper.js
…
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
jsconfig.json Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
package.json Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
postcss.config.js Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
priv-config
…
scalingo.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
stylelint.config.js Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +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?