masto-fe/app/lib
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
activitypub Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
ostatus Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
activity_tracker.rb Fix stats expiring too quickly because of variable mistake (#6155) 2018-01-02 14:02:53 +01:00
application_extension.rb Conditional validations no longer accept strings for if/unless (#3124) 2017-05-19 03:11:23 +02:00
delivery_failure_tracker.rb After 7 days of repeated delivery failures, give up on inbox (#5131) 2017-09-29 03:16:20 +02:00
entity_cache.rb Fix missing updated_at attribute on emoji EntityCache (#7297) 2018-04-30 22:49:33 +02:00
exceptions.rb Detect and prevent image bombs, max. processable dimension 4096^2 (#7229) 2018-04-23 09:16:38 +02:00
extractor.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
fast_geometry_parser.rb Fix avatar and header issues by using custom geometry detector (#6515) 2018-02-21 03:40:12 +01:00
feed_manager.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
formatter.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
hash_object.rb Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings 2017-01-12 20:46:24 +01:00
inline_renderer.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
language_detector.rb Leave unknown language as nil if account is remote (#8861) 2018-10-05 19:17:46 +02:00
potential_friendship_tracker.rb Fix activity:interactions counter to count all interactions (#8037) 2018-07-16 18:35:43 +02:00
request.rb Do not sign useless User-Agent or Accept-Encoding headers (#8533) 2018-08-31 04:22:52 +02:00
rss_builder.rb Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
sanitize_config.rb Whitelist dat/ipfs/gopher links in sanitizer (#8034) 2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb Raise Mastodon::HostValidationError when host for HTTP request is private (#6410) 2018-02-24 19:16:11 +01:00
status_filter.rb Fix n+1 queries in StatusThreadingConcern (#7321) 2018-05-03 10:41:58 +02:00
status_finder.rb Raise an error for remote url in StatusFinder (#4776) 2017-09-02 17:42:47 +02:00
tag_manager.rb Introduce OStatus::TagManager (#5008) 2017-09-19 18:08:08 +02:00
themes.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
webfinger_resource.rb Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351) 2017-04-23 14:19:54 +02:00