bf94a43496
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default. |
||
---|---|---|
.. | ||
access_token_fabricator.rb | ||
accessible_access_token_fabricator.rb | ||
account_domain_block_fabricator.rb | ||
account_fabricator.rb | ||
account_moderation_note_fabricator.rb | ||
account_pin_fabricator.rb | ||
account_stat_fabricator.rb | ||
account_tag_stat_fabricator.rb | ||
account_warning_fabricator.rb | ||
account_warning_preset_fabricator.rb | ||
admin_action_log_fabricator.rb | ||
application_fabricator.rb | ||
backup_fabricator.rb | ||
block_fabricator.rb | ||
bookmark_fabricator.rb | ||
conversation_account_fabricator.rb | ||
conversation_fabricator.rb | ||
conversation_mute_fabricator.rb | ||
custom_emoji_fabricator.rb | ||
custom_filter_fabricator.rb | ||
domain_block_fabricator.rb | ||
email_domain_block_fabricator.rb | ||
favourite_fabricator.rb | ||
featured_tag_fabricator.rb | ||
follow_fabricator.rb | ||
follow_request_fabricator.rb | ||
identity_fabricator.rb | ||
import_fabricator.rb | ||
invite_fabricator.rb | ||
list_account_fabricator.rb | ||
list_fabricator.rb | ||
media_attachment_fabricator.rb | ||
mention_fabricator.rb | ||
mute_fabricator.rb | ||
notification_fabricator.rb | ||
relay_fabricator.rb | ||
report_fabricator.rb | ||
report_note_fabricator.rb | ||
scheduled_status_fabricator.rb | ||
session_activation_fabricator.rb | ||
setting_fabricator.rb | ||
site_upload_fabricator.rb | ||
status_fabricator.rb | ||
status_pin_fabricator.rb | ||
status_stat_fabricator.rb | ||
stream_entry_fabricator.rb | ||
subscription_fabricator.rb | ||
tag_fabricator.rb | ||
user_fabricator.rb | ||
web_push_subscription_fabricator.rb | ||
web_setting_fabricator.rb |