luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-11 20:57:44 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
16798 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 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
.circleci Update circleci (#21880) 2022-12-15 18:13:13 +01:00
.devcontainer Install SSH server into devcontainer image (#22679) 2023-01-05 13:32:59 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
bin
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Fix root key for glitch-soc pt-PT and pt-BR yaml translations (#2065) 2023-01-04 18:47:01 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +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-01-05 14:16:25 +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-01-05 14:16:25 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01: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
.editorconfig
.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 Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
.foreman
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 2017-06-26 13:15:24 +02:00
.gitignore helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Align everything to Node.js 16 (#22223) 2022-12-15 17:43:26 +01:00
.prettierignore Fix prettifier/lint issues (#2066) 2023-01-04 18:38:45 +01:00
.prettierrc.js
.profile
.rspec
.rubocop.yml Run Prettier on YML files (#22345) 2022-12-16 11:11:52 +09:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Bump Ruby version from 3.0.3 to 3.0.4 (#18028) 2022-08-15 04:39:58 +02:00
.slugignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.yarnclean
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
Aptfile Remove packages that are provided by Heroku stacks (#19836) 2022-12-15 18:55:29 +01:00
AUTHORS.md Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
babel.config.js
Capfile
CHANGELOG.md Bump version to 4.0.2 (#20725) 2022-11-15 03:57:18 +01:00
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01:00
config.ru
CONTRIBUTING.md Add links to glitch-soc's Crowdin (#2033) 2022-12-21 23:49:08 +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
Dockerfile Add hadolint as Dockerfile linter (#20993) 2022-12-15 15:57:17 +01:00
FEDERATION.md
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
ide-helper.js
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
jsconfig.json Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
LICENSE
package.json Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +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
Procfile
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
Rakefile
README.md Downgrade Node.js requirement to 14+ (#22342) 2023-01-05 13:47:36 +01:00
scalingo.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
SECURITY.md Change e-mail in SECURITY.md (#20384) 2022-11-11 05:26:43 +01: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-12-07 09:03:42 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +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?