mirror of https://github.com/tootsuite/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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| concerns | ||
| pubsubhubbub | ||
| account_search_service.rb | ||
| after_block_domain_from_account_service.rb | ||
| after_block_service.rb | ||
| app_sign_up_service.rb | ||
| authorize_follow_service.rb | ||
| backup_service.rb | ||
| base_service.rb | ||
| batched_remove_status_service.rb | ||
| block_domain_service.rb | ||
| block_service.rb | ||
| bootstrap_timeline_service.rb | ||
| fan_out_on_write_service.rb | ||
| favourite_service.rb | ||
| fetch_atom_service.rb | ||
| fetch_link_card_service.rb | ||
| fetch_oembed_service.rb | ||
| fetch_remote_account_service.rb | ||
| fetch_remote_status_service.rb | ||
| follow_service.rb | ||
| hashtag_query_service.rb | ||
| import_service.rb | ||
| mute_service.rb | ||
| notify_service.rb | ||
| post_status_service.rb | ||
| precompute_feed_service.rb | ||
| process_feed_service.rb | ||
| process_hashtags_service.rb | ||
| process_interaction_service.rb | ||
| process_mentions_service.rb | ||
| reblog_service.rb | ||
| reject_follow_service.rb | ||
| remove_status_service.rb | ||
| report_service.rb | ||
| resolve_account_service.rb | ||
| resolve_url_service.rb | ||
| search_service.rb | ||
| send_interaction_service.rb | ||
| subscribe_service.rb | ||
| suspend_account_service.rb | ||
| unblock_domain_service.rb | ||
| unblock_service.rb | ||
| unfavourite_service.rb | ||
| unfollow_service.rb | ||
| unmute_service.rb | ||
| unsubscribe_service.rb | ||
| update_account_service.rb | ||
| update_remote_profile_service.rb | ||
| verify_link_service.rb | ||
| verify_salmon_service.rb | ||