mastodon/app/lib
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
activitypub Change `tootctl media remove-orphans` to work for all classes (#13316) 2020-03-26 01:56:41 +01:00
connection_pool Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
nodeinfo Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +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 Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565) 2019-04-21 04:53:24 +02:00
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
activity_tracker.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02: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 Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
entity_cache.rb Fix PostgreSQL load when linking in announcements (#13250) 2020-04-05 12:51:22 +02:00
exceptions.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01: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 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
formatter.rb Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe” 2020-03-24 12:07:47 +01: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 announcements (#12662) 2020-01-23 22:00:13 +01:00
language_detector.rb Bump cld3 from 3.2.6 to 3.3.0 (#13107) 2020-03-09 00:12:52 +01:00
potential_friendship_tracker.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
proof_provider.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
rate_limiter.rb Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
request.rb Fix error within error when limiting backtrace to 3 lines (#13120) 2020-05-10 10:30:27 +02:00
request_pool.rb Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
rss_builder.rb Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
sanitize_config.rb Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe” 2020-03-24 12:07:47 +01:00
search_query_parser.rb Fix accounts search by full/partial display name and others (#11580) 2019-08-16 13:00:30 +02:00
search_query_transformer.rb Fix error when searching for empty phrase (#12711) 2019-12-30 18:30:24 +01:00
sidekiq_error_handler.rb Fix error within error when limiting backtrace to 3 lines (#13120) 2020-05-10 10:30:27 +02:00
spam_check.rb Exempt staff members from spam check (#12874) 2020-01-17 07:50:30 +01:00
status_filter.rb Fix n+1 queries in StatusThreadingConcern (#7321) 2018-05-03 10:41:58 +02:00
status_finder.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.rb Fix crash when invalid addresses are linked in HTML or Markdown toots 2020-05-09 16:01:00 +02:00
themes.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
toc_generator.rb Add fallback section ID with ToC (#11941) 2019-09-23 17:25:10 +02:00
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
webfinger_resource.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00