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

Add option to include reported statuses in warning e-mail (#11639)

2019-08-23 22:37:23 +02:00

concerns

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

2019-07-19 18:26:49 +02:00

form

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

2019-09-11 16:32:44 +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

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

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

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

Add specs for CustomEmojiFilter (#9599)

2018-12-21 18:52:57 +01: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_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

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

Add featured hashtags to profiles (#9755)

2019-02-04 04:25:59 +01: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

Fix invites not being disabled upon account suspension (#11412)

2019-07-26 18:55:33 +02: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

marker_spec.rb

Add timeline read markers API (#11762)

2019-09-06 13:55:51 +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

poll_spec.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

poll_vote_spec.rb

Implement pending tests (#11415)

2019-07-27 10:24:26 +02: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

Fix uncaught domain normalization error in remote follow (#11703)

2019-08-30 02:19:17 +02:00

report_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

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

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

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01: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

Remove deprecated REST API GET /api/v1/timelines/direct (#11212)

2019-07-05 02:14:56 +02:00

status_stat_spec.rb

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

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

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

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