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

..

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

…

invite_policy.rb

Add admin function to deactivate all invites (#8279)

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

relay_policy.rb

Add federation relay support (#7998)

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

report_note_policy.rb

Feature: Report improvements (#6967) (#7000)

2018-04-02 22:04:14 +02:00

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

Allow mods to disable login, improve message when login disabled (#8329)

2018-08-23 23:26:29 +02:00