Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

..

activitypub

Add ActivityPub actor representing the entire server (#11321)

2019-07-19 01:44:42 +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

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

settings

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-27 13:23:02 +01:00

activity_tracker.rb

Create Redisable#redis (#9633)

2019-02-02 19:11:38 +01:00

application_extension.rb

…

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

Remove intermediary arrays when creating hash maps from results (#9291)

2018-11-16 15:02:18 +01: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

Use a redis-cached feed for the DM timeline

2019-06-27 16:44:12 +02:00

formatter.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

hash_object.rb

…

inline_renderer.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

language_detector.rb

Change language detection to include hashtags as words (#11341)

2019-07-18 03:02:15 +02: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

request_pool.rb

Add request pool to improve delivery performance (#10353)

2019-07-02 00:34:38 +02:00

request.rb

Add HTTP signatures to all outgoing ActivityPub GET requests (#11284)

2019-07-11 14:49:55 +02:00

rss_builder.rb

Add RSS feeds for end-users (#7259)

2018-04-25 02:10:02 +02:00

sanitize_config.rb

Fix sanitizing lists contents (#11354)

2019-07-19 01:44:58 +02:00

sidekiq_error_handler.rb

Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)

2019-07-02 01:01:17 +02:00

spam_check.rb

Add setting to disable the anti-spam (#11296)

2019-07-17 21:09:15 +02: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

Refactor domain block checks (#11268)

2019-07-09 03:27:35 +02:00

themes.rb

Allow selecting both default flavour and theme

2018-10-12 19:06:35 +02:00

user_settings_decorator.rb

Add option to disable real-time updates in web UI (#9984)

2019-07-16 16:11:50 +02:00

webfinger_resource.rb

Add ActivityPub actor representing the entire server (#11321)

2019-07-19 01:44:42 +02:00