vt-social/lib
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
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
chewy/strategy Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 2019-10-10 06:48:53 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
paperclip Fix downloading remote media files when server returns empty filename (#14867) 2020-09-27 22:00:43 +02:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00