mirror of https://github.com/tootsuite/mastodon
dcded13a99
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both. |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_conversation.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_moderation_note.rb | ||
| account_pin.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 | ||