Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... 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)		2019-09-13 18:13:43 +02:00
..
assets
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
account_fabricator.rb
account_identity_proof_fabricator.rb
account_moderation_note_fabricator.rb
account_pin_fabricator.rb
account_stat_fabricator.rb
account_tag_stat_fabricator.rb
account_warning_fabricator.rb
account_warning_preset_fabricator.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
admin_action_log_fabricator.rb
application_fabricator.rb
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb
conversation_account_fabricator.rb
conversation_fabricator.rb
conversation_mute_fabricator.rb
custom_emoji_category_fabricator.rb
custom_emoji_fabricator.rb
custom_filter_fabricator.rb
domain_allow_fabricator.rb
domain_block_fabricator.rb
email_domain_block_fabricator.rb
favourite_fabricator.rb
featured_tag_fabricator.rb
follow_fabricator.rb
follow_request_fabricator.rb
identity_fabricator.rb
import_fabricator.rb	Import feature for following/blocking lists (addresses #62, #177, #201, #454)	2017-03-30 19:42:33 +02:00
invite_fabricator.rb
list_account_fabricator.rb
list_fabricator.rb
marker_fabricator.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb
poll_fabricator.rb
poll_vote_fabricator.rb
relay_fabricator.rb
report_fabricator.rb
report_note_fabricator.rb
scheduled_status_fabricator.rb
session_activation_fabricator.rb
setting_fabricator.rb
site_upload_fabricator.rb
status_fabricator.rb
status_pin_fabricator.rb
status_stat_fabricator.rb
tag_fabricator.rb
user_fabricator.rb
user_invite_request_fabricator.rb
web_push_subscription_fabricator.rb
web_setting_fabricator.rb