3e4b8636a0
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version. |
||
---|---|---|
.circleci | ||
.devcontainer | ||
.github | ||
app | ||
bin | ||
chart | ||
config | ||
db | ||
dist | ||
lib | ||
log | ||
public | ||
spec | ||
streaming | ||
vendor | ||
.browserslistrc | ||
.buildpacks | ||
.codeclimate.yml | ||
.deepsource.toml | ||
.dockerignore | ||
.editorconfig | ||
.env.production.sample | ||
.env.test | ||
.env.vagrant | ||
.eslintignore | ||
.eslintrc.js | ||
.foreman | ||
.gitattributes | ||
.gitignore | ||
.gitmodules | ||
.haml-lint.yml | ||
.nanoignore | ||
.nvmrc | ||
.prettierignore | ||
.prettierrc.js | ||
.profile | ||
.rspec | ||
.rubocop.yml | ||
.ruby-gemset | ||
.ruby-version | ||
.slugignore | ||
.yarnclean | ||
AUTHORS.md | ||
Aptfile | ||
CHANGELOG.md | ||
CODE_OF_CONDUCT.md | ||
CONTRIBUTING.md | ||
Capfile | ||
Dockerfile | ||
FEDERATION.md | ||
Gemfile | ||
Gemfile.lock | ||
LICENSE | ||
Procfile | ||
Procfile.dev | ||
README.md | ||
Rakefile | ||
SECURITY.md | ||
Vagrantfile | ||
app.json | ||
babel.config.js | ||
config.ru | ||
crowdin.yml | ||
docker-compose.yml | ||
ide-helper.js | ||
jest.config.js | ||
jsconfig.json | ||
package.json | ||
postcss.config.js | ||
priv-config | ||
scalingo.json | ||
stylelint.config.js | ||
yarn.lock |
README.md
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.