Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
admin	Add a spec for Admin::ActionLog (#9775)	2019-01-11 07:28:09 +00:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
form
web
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
account_stat_spec.rb
account_tag_stat_spec.rb
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
domain_block_spec.rb
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	Add featured hashtags to profiles (#9755)	2019-02-04 04:25:59 +01:00
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
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
poll_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
poll_vote_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
preview_card_spec.rb
relay_spec.rb
remote_follow_spec.rb
remote_profile_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
stream_entry_spec.rb
subscription_spec.rb
tag_spec.rb
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