1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 14:18:34 +09:00
YuruToot/app/helpers
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
admin Add hCaptcha support (#25019) 2023-05-16 23:27:35 +02:00
accounts_helper.rb Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
application_helper.rb Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
branding_helper.rb Fix Rails/ContentTag cop (#24691) 2023-04-30 06:47:15 +02:00
context_helper.rb Compact JSON-LD signed incoming activities (#17426) 2022-02-03 14:07:29 +01:00
database_helper.rb Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
domain_control_helper.rb Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
email_helper.rb Apply Rubocop Performance/StringReplacement (#23445) 2023-02-08 03:21:21 +01:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
formatting_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
home_helper.rb Fix regressions from change in account row design in web UI (#24343) 2023-04-01 09:27:23 +02:00
instance_helper.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
jsonld_helper.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
languages_helper.rb Disable some metrics cops (#25215) 2023-05-31 23:33:10 +02:00
mascot_helper.rb Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
media_component_helper.rb React component helper specs (#24072) 2023-04-26 18:21:32 +02:00
react_component_helper.rb Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
routing_helper.rb Fix CDN_HOST not affected on full_asset_url (#18662) 2022-06-23 23:09:32 +02:00
settings_helper.rb Remove unused picture_hint helper method (#25485) 2023-06-19 09:04:15 +02:00
statuses_helper.rb Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00