mastodon/spec/fabricators
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
account_fabricator.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
account_moderation_note_fabricator.rb
account_pin_fabricator.rb Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
account_stat_fabricator.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
account_tag_stat_fabricator.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_warning_fabricator.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_warning_preset_fabricator.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
admin_action_log_fabricator.rb
application_fabricator.rb
backup_fabricator.rb
block_fabricator.rb
bookmark_fabricator.rb
conversation_account_fabricator.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
conversation_fabricator.rb
conversation_mute_fabricator.rb
custom_emoji_fabricator.rb
custom_filter_fabricator.rb Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
domain_block_fabricator.rb
email_domain_block_fabricator.rb
favourite_fabricator.rb
featured_tag_fabricator.rb Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
follow_fabricator.rb
follow_request_fabricator.rb
identity_fabricator.rb
import_fabricator.rb
invite_fabricator.rb
list_account_fabricator.rb
list_fabricator.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
media_attachment_fabricator.rb
mention_fabricator.rb
mute_fabricator.rb
notification_fabricator.rb
relay_fabricator.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
report_fabricator.rb
report_note_fabricator.rb Add tests for report notes controller (#7589) 2018-05-22 14:45:10 +02:00
scheduled_status_fabricator.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
session_activation_fabricator.rb
setting_fabricator.rb
site_upload_fabricator.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
status_fabricator.rb
status_pin_fabricator.rb
status_stat_fabricator.rb Move status counters to separate table, count replies (#8104) 2018-08-14 19:19:32 +02:00
stream_entry_fabricator.rb
subscription_fabricator.rb
tag_fabricator.rb
user_fabricator.rb Add REST API for creating an account (#9572) 2018-12-24 19:12:38 +01:00
web_push_subscription_fabricator.rb Ensure push subscription is immediately removed when application is revoked (#7548) 2018-05-19 21:05:08 +02:00
web_setting_fabricator.rb Ensure push subscription is immediately removed when application is revoked (#7548) 2018-05-19 21:05:08 +02:00