mastodon-glitch/app/policies
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +01:00
..
account_moderation_note_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
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
announcement_policy.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
application_policy.rb Account archive download (#6460) 2018-02-21 23:21:32 +01:00
backup_policy.rb Account archive download (#6460) 2018-02-21 23:21:32 +01:00
custom_emoji_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
domain_allow_policy.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_block_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
email_domain_block_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
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 Feature: Report improvements (#6967) (#7000) 2018-04-02 22:04:14 +02:00
report_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
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 2019-07-19 18:26:49 +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