forked from mirrors/catstodon
016d194274
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests. |
||
---|---|---|
.. | ||
api | ||
well_known | ||
account_show_page_spec.rb | ||
accounts_spec.rb | ||
anonymous_cookies_spec.rb | ||
backups_spec.rb | ||
cache_spec.rb | ||
catch_all_route_request_spec.rb | ||
content_security_policy_spec.rb | ||
custom_css_spec.rb | ||
disabled_oauth_endpoints_spec.rb | ||
follower_accounts_spec.rb | ||
following_accounts_spec.rb | ||
invite_spec.rb | ||
link_headers_spec.rb | ||
localization_spec.rb | ||
mail_subscriptions_spec.rb | ||
omniauth_callbacks_spec.rb | ||
remote_interaction_helper_spec.rb | ||
signature_verification_spec.rb |