mastodon/app/helpers
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
..
admin Fix admin actions log crash when displaying updates of deleted announcements (#13489) 2020-04-17 19:54:58 +02:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
accounts_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-02-06 21:36:38 +01:00
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
domain_control_helper.rb Fix whitelist federation for subdomains (#12435) 2019-11-21 11:35:39 +01:00
flashes_helper.rb
home_helper.rb Fix use of inline CSS in public pages (#13576) 2020-05-03 22:04:18 +02:00
instance_helper.rb Change OpenGraph description on sign-up page to reflect invite (#11744) 2019-09-03 04:56:54 +02:00
jsonld_helper.rb Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316) 2019-07-28 13:48:43 +02:00
routing_helper.rb Fix ruby 2.7 warnings about keyword parameters (#12824) 2020-01-11 21:38:02 +01:00
settings_helper.rb Add `vi` to available locales (#13542) 2020-05-10 11:25:35 +02:00
statuses_helper.rb Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
webfinger_helper.rb Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02:00