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.rb | ||
account_conversation.rb | ||
account_domain_block.rb | ||
account_filter.rb | ||
account_moderation_note.rb | ||
account_pin.rb | ||
account_stat.rb | ||
account_tag_stat.rb | ||
admin.rb | ||
application_record.rb | ||
backup.rb | ||
block.rb | ||
bookmark.rb | ||
context.rb | ||
conversation.rb | ||
conversation_mute.rb | ||
custom_emoji.rb | ||
custom_emoji_filter.rb | ||
custom_filter.rb | ||
domain_block.rb | ||
email_domain_block.rb | ||
export.rb | ||
favourite.rb | ||
feed.rb | ||
follow.rb | ||
follow_request.rb | ||
home_feed.rb | ||
identity.rb | ||
import.rb | ||
instance.rb | ||
instance_filter.rb | ||
invite.rb | ||
invite_filter.rb | ||
list.rb | ||
list_account.rb | ||
list_feed.rb | ||
media_attachment.rb | ||
mention.rb | ||
mute.rb | ||
notification.rb | ||
preview_card.rb | ||
relay.rb | ||
remote_follow.rb | ||
remote_profile.rb | ||
report.rb | ||
report_filter.rb | ||
report_note.rb | ||
search.rb | ||
session_activation.rb | ||
setting.rb | ||
site_upload.rb | ||
status.rb | ||
status_pin.rb | ||
status_stat.rb | ||
stream_entry.rb | ||
subscription.rb | ||
tag.rb | ||
trending_tags.rb | ||
user.rb | ||
web.rb |