Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

..

admin

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

concerns

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-27 13:23:02 +01:00

form

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

web

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

account_conversation_spec.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

account_domain_block_spec.rb

Spec AccountDomainBlock (#3816)

2017-06-18 02:59:49 +02:00

account_filter_spec.rb

Redesign admin accounts index (#9340)

2018-11-26 15:53:27 +01:00

account_moderation_note_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

account_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-27 13:23:02 +01:00

account_stat_spec.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

account_tag_stat_spec.rb

Add specs for AccountTagStat model (#9452)

2018-12-07 16:37:56 +01:00

backup_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

block_spec.rb

Cover Block more (#3837)

2017-06-19 11:31:37 +02:00

conversation_mute_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

conversation_spec.rb

Add conversation model, <ostatus:conversation /> (#3016)

2017-05-12 19:09:21 +02:00

custom_emoji_spec.rb

Make custom emoji domains case insensitive #9351 (#9474)

2018-12-11 05:30:57 +01:00

custom_filter_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

domain_block_spec.rb

Cover DomainBlock more (#3838)

2017-06-19 11:31:27 +02:00

email_domain_block_spec.rb

Add uniqueness to block email domains (#5692)

2017-11-14 20:37:17 +01:00

export_spec.rb

Show exact number of followers/statuses on export page/in tooltip (#8199)

2018-08-14 21:56:17 +02:00

favourite_spec.rb

Cover Favourite more (#3841)

2017-06-19 01:38:50 +02:00

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

Lists (#5703)

2017-11-18 00:16:48 +01:00

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

Add consumable invites (#5814)

2017-11-27 16:07:59 +01:00

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

add more tests to models

2017-04-05 00:29:56 +02:00

mute_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

notification_spec.rb

Remove pending spec (#9442)

2018-12-06 17:39:15 +09:00

preview_card_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

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

Add tests for RemoteProfile (#5665)

2017-11-12 16:23:31 +09:00

report_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

2017-05-22 15:50:58 -04:00

report_spec.rb

Add missing tests for report.rb (#7324)

2018-05-03 10:42:36 +02:00

session_activation_spec.rb

Add tests for SessionActivation (#5668)

2017-11-13 09:54:48 +09:00

setting_spec.rb

Isolate each specs for cache store (#6450)

2018-02-17 22:35:05 +01:00

site_upload_spec.rb

Add a test for SiteUpload#cache_key (#5685)

2017-11-14 20:44:11 +01:00

status_pin_spec.rb

Append '.test' to hostname in stub data (#7260)

2018-04-25 14:12:28 +02:00

status_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-08 13:51:33 +02:00

status_stat_spec.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

stream_entry_spec.rb

Add tests for StreamEntry (#5687)

2017-11-15 02:00:58 +01:00

subscription_spec.rb

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00

tag_spec.rb

Add a test for Tag#to_param (#5705)

2017-11-15 16:04:41 +01:00

user_spec.rb

Redesign admin accounts index (#9340)

2018-11-26 15:53:27 +01:00