mastodon/app/helpers
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
admin Add IP-based rules (#14963) 2020-10-12 16:33:49 +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 Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
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 Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00