mastodon/app/lib
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
..
activitypub Do not accept ActivityPub follow requests from blocked user (#7756) 2018-06-08 00:14:06 +02:00
ostatus Fix N+1 on AtomSerializer (#7669) 2018-05-29 13:34:02 +02:00
settings
activity_tracker.rb
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
feed_manager.rb Make whole-word filter regex consistent between Ruby and JS (#7987) 2018-07-10 03:01:50 +02: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
hash_object.rb
inline_renderer.rb
language_detector.rb Disable language detection for texts shorter than 140 characters (#8010) 2018-07-14 04:05:36 +02:00
potential_friendship_tracker.rb Do not count self in potential friendships (#8014) 2018-07-14 10:44:23 +09:00
request.rb Merge HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY into ALLOW_ACCESS_TO_HIDDEN_SERVICE (#7901) 2018-06-29 15:36:02 +02:00
rss_builder.rb Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
sanitize_config.rb
sidekiq_error_handler.rb
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 branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
webfinger_resource.rb