mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-13 16:07:50 +00:00
296b3d1560
Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change. |
||
---|---|---|
.. | ||
account | ||
admin | ||
concerns | ||
form | ||
trends | ||
user_settings | ||
web | ||
account_conversation_spec.rb | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_migration_spec.rb | ||
account_spec.rb | ||
account_statuses_cleanup_policy_spec.rb | ||
account_statuses_filter_spec.rb | ||
account_warning_preset_spec.rb | ||
appeal_spec.rb | ||
block_spec.rb | ||
canonical_email_block_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_category_spec.rb | ||
custom_emoji_filter_spec.rb | ||
custom_emoji_spec.rb | ||
domain_allow_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
export_spec.rb | ||
extended_description_spec.rb | ||
favourite_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
home_feed_spec.rb | ||
identity_spec.rb | ||
import_spec.rb | ||
invite_spec.rb | ||
ip_block_spec.rb | ||
marker_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
notification_spec.rb | ||
one_time_key_spec.rb | ||
poll_spec.rb | ||
poll_vote_spec.rb | ||
preview_card_provider_spec.rb | ||
privacy_policy_spec.rb | ||
public_feed_spec.rb | ||
relationship_filter_spec.rb | ||
remote_follow_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
rule_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_edit_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
tag_feed_spec.rb | ||
tag_spec.rb | ||
user_role_spec.rb | ||
user_settings_spec.rb | ||
user_spec.rb | ||
webauthn_credentials_spec.rb | ||
webhook_spec.rb |