Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.

2018-10-05 15:23:57 +02:00

..

admin

Lint pass (#8876)

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

concerns

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

2018-08-31 19:10:57 +02:00

form

…

web

Lint pass (#8876)

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

account_domain_block_spec.rb

…

account_filter_spec.rb

Change admin accounts default sort to most recent (#8813)

2018-10-04 16:05:38 +02:00

account_moderation_note_spec.rb

Lint pass (#8876)

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

account_pin_spec.rb

Public profile endorsements (accounts picked by profile owner) (#8146)

2018-08-09 09:56:53 +02:00

account_spec.rb

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

2018-10-05 15:23:57 +02:00

backup_spec.rb

Lint pass (#8876)

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

block_spec.rb

…

conversation_mute_spec.rb

Lint pass (#8876)

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

conversation_spec.rb

…

custom_emoji_spec.rb

Lint pass (#8876)

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

custom_filter_spec.rb

Lint pass (#8876)

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

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

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

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

favourite_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

Lists (#5703)

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

identity_spec.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

import_spec.rb

…

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

…

mute_spec.rb

Lint pass (#8876)

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

notification_spec.rb

Change columns in notifications nonnullable (#6764)

2018-03-24 12:51:28 +01: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

…

report_filter_spec.rb

…

report_spec.rb

Add missing tests for report.rb (#7324)

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

session_activation_spec.rb

…

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-08-22 20:56:32 +02:00

status_stat_spec.rb

Move status counters to separate table, count replies (#8104)

2018-08-14 19:19:32 +02: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

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00