mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/controllers/concerns
History
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 		2024-10-26 13:38:07 +02:00
..
admin File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
api Extract wrapper constant for `HTTP::*` error classes (#32285) 2024-10-08 13:53:35 +00:00
auth Move hcaptcha service config to `config_for` yml (#30662) 2024-10-23 14:25:43 +00:00
settings File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
account_controller_concern.rb Add `have_http_link_header` matcher and set header values as strings (#31010) 2024-09-05 20:05:38 +00: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 Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00
challengable_concern.rb Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00:00
localized.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
preloading_concern.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00: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 Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00:00
theming_concern.rb Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 2024-05-01 14:25:47 +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 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00