Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
form
web
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb
account_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
account_stat_spec.rb
account_tag_stat_spec.rb
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
custom_emoji_category_spec.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
domain_allow_spec.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_block_spec.rb	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
email_domain_block_spec.rb
export_spec.rb	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
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	Fix invites not being disabled upon account suspension (#11412)	2019-07-26 18:55:33 +02:00
list_account_spec.rb
list_spec.rb
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
poll_spec.rb
poll_vote_spec.rb	Implement pending tests (#11415)	2019-07-27 10:24:26 +02:00
preview_card_spec.rb
relay_spec.rb
remote_follow_spec.rb
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
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
status_stat_spec.rb
tag_spec.rb	Add more accurate hashtag search (#11579)	2019-08-18 03:45:51 +02:00
user_invite_request_spec.rb	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
user_spec.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00