mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity
Mirror of glitch-soc/mastodon@github.com
20,400 Commits 58 Branches 15 Tags 569 MiB
JavaScript 41.8%
Ruby 40.9%
SCSS 12.5%
Haml 4.4%
HTML 0.2%
Go to file
Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
 		2024-01-15 20:01:36 +01:00
.devcontainer
…
.github
…
.husky
…
.yarn
…
app Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 2024-01-15 20:01:36 +01:00
bin
…
chart
…
config Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 2024-01-15 20:01:36 +01:00
db
…
dist
…
lib Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
log
…
public Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 2024-01-15 20:01:36 +01:00
spec Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
streaming
…
vendor
…
.browserslistrc
…
.buildpacks
…
.dockerignore
…
.editorconfig
…
.env.production.sample
…
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint.yml
…
.haml-lint_todo.yml
…
.nanoignore
…
.nvmrc
…
.prettierignore
…
.prettierrc.js
…
.profile
…
.rspec
…
.rubocop.yml
…
.rubocop_todo.yml
…
.ruby-gemset
…
.ruby-version
…
.simplecov
…
.slugignore
…
.watchmanconfig
…
.yarnrc.yml
…
AUTHORS.md
…
Aptfile
…
CHANGELOG.md
…
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md
…
Dockerfile
…
FEDERATION.md
…
Gemfile
…
Gemfile.lock
…
LICENSE
…
Procfile
…
Procfile.dev
…
README.md
…
Rakefile
…
SECURITY.md
…
Vagrantfile
…
app.json
…
babel.config.js
…
config.ru
…
crowdin-glitch.yml
…
crowdin.yml
…
docker-compose.yml
…
ide-helper.js
…
jest.config.js
…
jsconfig.json
…
lint-staged.config.js
…
package.json
…
postcss.config.js
…
priv-config
…
scalingo.json
…
stylelint.config.js
…
tsconfig.json
…
yarn.lock
…

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?