mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 11:00:26 -05:00
4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cache_cli.rb | ||
| canonical_email_blocks_cli.rb | ||
| cli_helper.rb | ||
| domains_cli.rb | ||
| email_domain_blocks_cli.rb | ||
| emoji_cli.rb | ||
| feeds_cli.rb | ||
| ip_blocks_cli.rb | ||
| maintenance_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| preview_cards_cli.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| search_cli.rb | ||
| settings_cli.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| statuses_cli.rb | ||
| upgrade_cli.rb | ||
| version.rb | ||