mirror of https://github.com/Siphonay/mastodon
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. |
||
|---|---|---|
| .. | ||
| 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_filter_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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| stream_entry_spec.rb | ||
| subscription_spec.rb | ||
| tag_spec.rb | ||
| user_spec.rb | ||