mastodon/app/policies
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
account_moderation_note_policy.rb
account_policy.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
account_warning_preset_policy.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
announcement_policy.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb
domain_allow_policy.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
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
ip_block_policy.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +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 Add ability to delete files uploaded for settings in admin UI (#13192) 2020-03-08 16:00:24 +01:00
status_policy.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
tag_policy.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
user_policy.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00