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
concerns
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	Add conversation model, <ostatus:conversation /> (#3016)	2017-05-12 19:09:21 +02:00
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
domain_block_spec.rb
email_domain_block_spec.rb	Add uniqueness to block email domains (#5692)	2017-11-14 20:37:17 +01:00
export_spec.rb	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
favourite_spec.rb	Cover Favourite more (#3841)	2017-06-19 01:38:50 +02:00
featured_tag_spec.rb
follow_request_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-04 14:16:30 -05:00
follow_spec.rb	Limit the number of people that can be followed from one account (#8807)	2018-10-04 17:36:11 +02:00
home_feed_spec.rb
identity_spec.rb	Add spec for Identity.find_for_oauth (#9441)	2018-12-06 17:38:49 +09:00
import_spec.rb	Validate data of Imports (#4782)	2017-09-02 20:45:42 +02:00
invite_spec.rb
list_account_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
list_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
media_attachment_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
mention_spec.rb
mute_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
notification_spec.rb
poll_spec.rb
poll_vote_spec.rb
preview_card_spec.rb
relay_spec.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
remote_follow_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
remote_profile_spec.rb
report_filter_spec.rb
report_spec.rb
scheduled_status_spec.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
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