mastodon/spec/lib
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
2019-03-16 14:14:20 +01:00
..
activitypub Do not allow adding votes to expired polls (#10214) 2019-03-08 00:54:50 +01:00
ostatus rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
formatter_spec.rb Fix URL linkifier grabbing full-width spaces and quotations (#9997) 2019-02-09 20:13:11 +01:00
hash_object_spec.rb
language_detector_spec.rb Fix language detection of non-latin alphabets even at few characters (#10276) 2019-03-15 05:07:09 +01:00
request_spec.rb Fix connect timeout not being enforced (#9329) 2018-11-22 20:12:04 +01:00
status_filter_spec.rb
status_finder_spec.rb Add tests for embeds controller (#7719) 2018-06-04 10:35:56 +09:00
tag_manager_spec.rb Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02:00
user_settings_decorator_spec.rb Enable updating additional account information from user preferences via rest api (#6789) 2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb