Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

account_moderation_note_policy.rb

…

account_policy.rb

Add moderation warnings (#9519)

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

account_warning_preset_policy.rb

Add moderation warnings (#9519)

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

application_policy.rb

…

backup_policy.rb

…

custom_emoji_policy.rb

…

domain_block_policy.rb

…

email_domain_block_policy.rb

…

instance_policy.rb

Redesign admin instances area (#9645)

2019-01-08 13:39:49 +01:00

invite_policy.rb

Add admin function to deactivate all invites (#8279)

2018-08-19 00:58:53 +02:00

poll_policy.rb

Ensure only people allowed to see the poll can actually vote (#10161)

2019-03-04 22:47:47 +01:00

relay_policy.rb

Add federation relay support (#7998)

2018-07-13 02:16:06 +02:00

report_note_policy.rb

…

report_policy.rb

…

settings_policy.rb

…

status_policy.rb

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

2018-10-22 17:51:38 +02:00

subscription_policy.rb

…

tag_policy.rb

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00

user_policy.rb

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01:00