mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-26 14:53:41 +01:00
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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller_spec.rb | ||
| account_follow_controller_spec.rb | ||
| account_unfollow_controller_spec.rb | ||
| accounts_controller_spec.rb | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| emojis_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| home_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| manifests_controller_spec.rb | ||
| media_controller_spec.rb | ||
| remote_follow_controller_spec.rb | ||
| remote_unfollows_controller_spec.rb | ||
| shares_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| stream_entries_controller_spec.rb | ||
| tags_controller_spec.rb | ||