mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 14:38:07 +01:00
65e994b29b
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours. |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
form | ||
web | ||
account_conversation_spec.rb | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_moderation_note_spec.rb | ||
account_spec.rb | ||
account_stat_spec.rb | ||
account_tag_stat_spec.rb | ||
backup_spec.rb | ||
block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_spec.rb | ||
custom_filter_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
export_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 | ||
list_account_spec.rb | ||
list_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
preview_card_spec.rb | ||
relay_spec.rb | ||
remote_follow_spec.rb | ||
remote_profile_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
status_stat_spec.rb | ||
stream_entry_spec.rb | ||
subscription_spec.rb | ||
tag_spec.rb | ||
user_spec.rb |