mirror of https://github.com/mastodon/mastodon
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
|
4 years ago | |
|---|---|---|
| .circleci | 5 years ago | |
| .github | 5 years ago | |
| app | 4 years ago | |
| bin | 5 years ago | |
| chart | 5 years ago | |
| config | 4 years ago | |
| db | 4 years ago | |
| dist | ||
| lib | 4 years ago | |
| log | ||
| nanobox | ||
| public | 5 years ago | |
| spec | 4 years ago | |
| streaming | 5 years ago | |
| vendor | ||
| .buildpacks | 5 years ago | |
| .codeclimate.yml | 5 years ago | |
| .dockerignore | ||
| .editorconfig | ||
| .env.nanobox | ||
| .env.production.sample | ||
| .env.test | ||
| .env.vagrant | ||
| .eslintignore | ||
| .eslintrc.js | ||
| .foreman | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| .haml-lint.yml | ||
| .nanoignore | ||
| .nvmrc | ||
| .profile | ||
| .rspec | ||
| .rubocop.yml | 5 years ago | |
| .ruby-version | ||
| .sass-lint.yml | ||
| .slugignore | ||
| .yarnclean | ||
| AUTHORS.md | 5 years ago | |
| Aptfile | 5 years ago | |
| CHANGELOG.md | 5 years ago | |
| CODE_OF_CONDUCT.md | ||
| CONTRIBUTING.md | ||
| Capfile | ||
| Dockerfile | 5 years ago | |
| Gemfile | 4 years ago | |
| Gemfile.lock | 4 years ago | |
| LICENSE | ||
| Procfile | 5 years ago | |
| Procfile.dev | ||
| README.md | ||
| Rakefile | ||
| SECURITY.md | ||
| Vagrantfile | ||
| app.json | 5 years ago | |
| babel.config.js | ||
| boxfile.yml | ||
| config.ru | ||
| crowdin.yml | ||
| docker-compose.yml | ||
| ide-helper.js | ||
| package.json | 4 years ago | |
| postcss.config.js | ||
| priv-config | ||
| scalingo.json | ||
| yarn.lock | 4 years ago | |
README.md
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and then it runs on dev.glitch.social 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.