mirror of
https://github.com/funamitech/mastodon
synced 2024-12-04 17:58:49 +09:00
74c5b2bd08
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) |
||
---|---|---|
.. | ||
account_actions_controller.rb | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
base_controller.rb | ||
change_emails_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
dashboard_controller.rb | ||
domain_allows_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
followers_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
pending_accounts_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reported_statuses_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
settings_controller.rb | ||
statuses_controller.rb | ||
subscriptions_controller.rb | ||
tags_controller.rb | ||
two_factor_authentications_controller.rb | ||
warning_presets_controller.rb |