Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +01:00

..

admin

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

concerns

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

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

form

…

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

…

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

account_warning_preset_spec.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

account_warning_spec.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01: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_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_block_spec.rb

…

email_domain_block_spec.rb

…

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

…

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

…

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

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

…

report_filter_spec.rb

…

report_spec.rb

…

session_activation_spec.rb

…

setting_spec.rb

…

site_upload_spec.rb

…

status_pin_spec.rb

…

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

…

subscription_spec.rb

Misc. typos (#8694)

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

tag_spec.rb

…

user_spec.rb

Redesign admin accounts index (#9340)

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