luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 20:32:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/helpers
History
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
accounts_helper.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
application_helper.rb Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +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
domain_control_helper.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
email_helper.rb Apply Rubocop Performance/StringReplacement (#23445) 2023-02-08 03:21:21 +01:00
flashes_helper.rb
formatting_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01: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 Remove tai locale (#23880) 2023-04-23 22:49:07 +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 React component helper specs (#24072) 2023-04-26 18:21:32 +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 language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statuses_helper.rb Fix Rails/CompactBlank cop (#24690) 2023-04-30 14:07:21 +02:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00