mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 00:15:05 +00: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) |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
form | ||
web | ||
account_conversation_spec.rb | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_moderation_note_spec.rb | ||
account_spec.rb | ||
account_stat_spec.rb | ||
account_tag_stat_spec.rb | ||
backup_spec.rb | ||
block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_category_spec.rb | ||
custom_emoji_filter_spec.rb | ||
custom_emoji_spec.rb | ||
custom_filter_spec.rb | ||
domain_allow_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
export_spec.rb | ||
favourite_spec.rb | ||
featured_tag_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
home_feed_spec.rb | ||
identity_spec.rb | ||
import_spec.rb | ||
invite_spec.rb | ||
list_account_spec.rb | ||
list_spec.rb | ||
marker_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
poll_spec.rb | ||
poll_vote_spec.rb | ||
preview_card_spec.rb | ||
relay_spec.rb | ||
remote_follow_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
scheduled_status_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
status_stat_spec.rb | ||
tag_spec.rb | ||
trending_tags_spec.rb | ||
user_invite_request_spec.rb | ||
user_spec.rb |