forked from mirrors/catstodon
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
aec61a703f
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. |
2 years ago | |
---|---|---|
.. | ||
admin | 2 years ago | |
account_moderation_note_policy.rb | 2 years ago | |
account_policy.rb | 2 years ago | |
account_warning_policy.rb | 2 years ago | |
account_warning_preset_policy.rb | 2 years ago | |
announcement_policy.rb | 2 years ago | |
appeal_policy.rb | 2 years ago | |
application_policy.rb | 2 years ago | |
audit_log_policy.rb | 2 years ago | |
backup_policy.rb | ||
canonical_email_block_policy.rb | 2 years ago | |
custom_emoji_policy.rb | 2 years ago | |
dashboard_policy.rb | 2 years ago | |
delivery_policy.rb | 2 years ago | |
domain_allow_policy.rb | 2 years ago | |
domain_block_policy.rb | 2 years ago | |
email_domain_block_policy.rb | 2 years ago | |
follow_recommendation_policy.rb | 2 years ago | |
instance_policy.rb | 2 years ago | |
invite_policy.rb | 2 years ago | |
ip_block_policy.rb | 2 years ago | |
poll_policy.rb | ||
preview_card_policy.rb | 2 years ago | |
preview_card_provider_policy.rb | 2 years ago | |
relay_policy.rb | 2 years ago | |
report_note_policy.rb | 2 years ago | |
report_policy.rb | 2 years ago | |
rule_policy.rb | 2 years ago | |
settings_policy.rb | 2 years ago | |
status_policy.rb | 2 years ago | |
tag_policy.rb | 2 years ago | |
user_policy.rb | 2 years ago | |
user_role_policy.rb | 2 years ago | |
webhook_policy.rb | 2 years ago |