mastodon-glitch/spec/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
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
connection_pool Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
ostatus Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
proof_provider/keybase Fix Keybase verification using wrong domain for remote accounts (#10547) 2019-04-10 20:28:43 +02:00
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
settings
delivery_failure_tracker_spec.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
extractor_spec.rb
fast_ip_map_spec.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
feed_manager_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
formatter_spec.rb Fix crash when autolinking an invalid URI in Markdown 2020-10-13 14:35:07 +02:00
hash_object_spec.rb
language_detector_spec.rb Change language detection to include hashtags as words (#11341) 2019-07-18 03:02:15 +02:00
request_pool_spec.rb Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
request_spec.rb Fix connect timeout not being enforced (#9329) 2018-11-22 20:12:04 +01:00
sanitize_config_spec.rb Add support for “start” and “reversed” attributes to ol element 2020-07-01 01:02:27 +02:00
spam_check_spec.rb Fix various warnings in rspec (#14729) 2020-09-04 20:22:26 +02:00
status_filter_spec.rb Record account suspend/silence time and keep track of domain blocks (#10660) 2019-05-14 19:05:02 +02:00
status_finder_spec.rb Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
tag_manager_spec.rb Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
user_settings_decorator_spec.rb
webfinger_resource_spec.rb Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00