mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-01 00:51:55 +00:00
a22e6a3683
Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior. |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account_alias_spec.rb | ||
| account_conversation_spec.rb | ||
| account_domain_block_spec.rb | ||
| account_filter_spec.rb | ||
| account_migration_spec.rb | ||
| account_moderation_note_spec.rb | ||
| account_spec.rb | ||
| account_stat_spec.rb | ||
| account_tag_stat_spec.rb | ||
| announcement_mute_spec.rb | ||
| announcement_reaction_spec.rb | ||
| announcement_spec.rb | ||
| backup_spec.rb | ||
| block_spec.rb | ||
| conversation_mute_spec.rb | ||
| conversation_spec.rb | ||
| custom_emoji_category_spec.rb | ||
| custom_emoji_filter_spec.rb | ||
| custom_emoji_spec.rb | ||
| custom_filter_spec.rb | ||
| domain_allow_spec.rb | ||
| domain_block_spec.rb | ||
| email_domain_block_spec.rb | ||
| export_spec.rb | ||
| favourite_spec.rb | ||
| featured_tag_spec.rb | ||
| follow_request_spec.rb | ||
| follow_spec.rb | ||
| home_feed_spec.rb | ||
| identity_spec.rb | ||
| import_spec.rb | ||
| invite_spec.rb | ||
| list_account_spec.rb | ||
| list_spec.rb | ||
| marker_spec.rb | ||
| media_attachment_spec.rb | ||
| mention_spec.rb | ||
| mute_spec.rb | ||
| notification_spec.rb | ||
| poll_spec.rb | ||
| poll_vote_spec.rb | ||
| preview_card_spec.rb | ||
| relay_spec.rb | ||
| remote_follow_spec.rb | ||
| report_filter_spec.rb | ||
| report_spec.rb | ||
| scheduled_status_spec.rb | ||
| session_activation_spec.rb | ||
| setting_spec.rb | ||
| site_upload_spec.rb | ||
| status_pin_spec.rb | ||
| status_spec.rb | ||
| status_stat_spec.rb | ||
| tag_spec.rb | ||
| trending_tags_spec.rb | ||
| unavailable_domain_spec.rb | ||
| user_invite_request_spec.rb | ||
| user_spec.rb | ||