mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 13:23:13 +00:00
3ef5f62abf
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did. |
||
|---|---|---|
| .devcontainer | ||
| .github | ||
| app | ||
| bin | ||
| chart | ||
| config | ||
| db | ||
| dist | ||
| lib | ||
| log | ||
| public | ||
| spec | ||
| streaming | ||
| vendor | ||
| .browserslistrc | ||
| .buildpacks | ||
| .bundler-audit.yml | ||
| .codeclimate.yml | ||
| .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 | ||
| .slugignore | ||
| .yarnclean | ||
| app.json | ||
| Aptfile | ||
| AUTHORS.md | ||
| babel.config.js | ||
| Capfile | ||
| CHANGELOG.md | ||
| CODE_OF_CONDUCT.md | ||
| config.ru | ||
| CONTRIBUTING.md | ||
| crowdin-glitch.yml | ||
| crowdin.yml | ||
| docker-compose.yml | ||
| Dockerfile | ||
| FEDERATION.md | ||
| Gemfile | ||
| Gemfile.lock | ||
| ide-helper.js | ||
| jest.config.js | ||
| jsconfig.json | ||
| LICENSE | ||
| package.json | ||
| postcss.config.js | ||
| priv-config | ||
| Procfile | ||
| Procfile.dev | ||
| Rakefile | ||
| README.md | ||
| scalingo.json | ||
| SECURITY.md | ||
| stylelint.config.js | ||
| Vagrantfile | ||
| yarn.lock | ||
Mastodon Glitch Edition
Now with automated deploys!
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?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.