forked from mirrors/catstodon
Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon
https://girldick.gay
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests. |
||
---|---|---|
.devcontainer | ||
.github | ||
.husky | ||
app | ||
bin | ||
chart | ||
config | ||
db | ||
dist | ||
lib | ||
log | ||
public | ||
spec | ||
streaming | ||
vendor | ||
.browserslistrc | ||
.buildpacks | ||
.bundler-audit.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.