mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-14 02:42:54 +00:00
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.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 | ||
account_warning.rb | ||
account_warning_preset.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 | ||
featured_tag.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 | ||
scheduled_status.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 | ||
tombstone.rb | ||
trending_tags.rb | ||
user.rb | ||
web.rb |