monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/concerns
History
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 		2024-02-24 14:46:14 +01:00
..
admin File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
api File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
auth Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
settings File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
account_controller_concern.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
account_owned_concern.rb Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053) 2023-11-30 15:43:26 +00:00
accountable_concern.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
authorization.rb Bump pundit from 2.1.1 to 2.2.0 (#17543) 2022-02-19 13:30:06 +09:00
cache_concern.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
challengable_concern.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
localized.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
session_tracking_concern.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
signature_authentication.rb Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) 2018-02-02 10:19:59 +01:00
signature_verification.rb Move HTTP Signature parsing code to its own class (#28932) 2024-02-07 13:35:37 +00:00
theming_concern.rb Fixing an issue with a missing argument (#2261) 2023-07-01 22:55:43 +02:00
user_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
web_app_controller_concern.rb Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00