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
..
admin
concerns
form	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
web
account_conversation_spec.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
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	Cover Block more (#3837)	2017-06-19 11:31:37 +02:00
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	Lists (#5703)	2017-11-18 00:16:48 +01:00
identity_spec.rb
import_spec.rb
invite_spec.rb	Fix invites not being disabled upon account suspension (#11412)	2019-07-26 18:55:33 +02:00
list_account_spec.rb
list_spec.rb
marker_spec.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
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	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
report_filter_spec.rb
report_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
status_stat_spec.rb
tag_spec.rb	Fix hashtags being split by ZWNJ character (#11821)	2019-09-13 16:01:26 +02:00
trending_tags_spec.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
user_invite_request_spec.rb
user_spec.rb