Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

activitypub

Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)

2018-05-05 18:22:34 +02:00

ostatus

If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398)

2018-05-07 14:49:13 +02:00

settings

…

activity_tracker.rb

Fix stats expiring too quickly because of variable mistake (#6155)

2018-01-02 14:02:53 +01:00

application_extension.rb

…

delivery_failure_tracker.rb

…

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

…

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 remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

formatter.rb

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

frontmatter_handler.rb

Remove ignored 'u' parameter on regexp (#392)

2018-03-27 11:30:49 -04:00

hash_object.rb

…

inline_renderer.rb

…

language_detector.rb

…

request.rb

Support gzip encoding on Request (#7425)

2018-05-09 16:59:39 +02:00

rss_builder.rb

Add RSS feeds for end-users (#7259)

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

sanitize_config.rb

[!] Sanitize incoming classlist properly (#6162)

2018-01-03 03:54:08 +01: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

…

tag_manager.rb

…

themes.rb

…

user_settings_decorator.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-08 19:05:02 -05:00

webfinger_resource.rb

…