5 Commits

Author	SHA1	Message	Date
Baptiste Lemoine	b872c1c7c0	Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js	2020-02-12 10:03:28 +01:00
ThibG	e25947db4a	Sanitize and sandbox toot embeds (#9552)	2018-12-23 02:16:35 +01:00
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301) ... * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	2018-05-02 18:58:48 +02:00
abcang	897199910f	Improve web api protect (#6343)	2018-04-17 15:23:46 +02:00
Eugen Rochko	d1a78eba15	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	2017-08-31 03:38:35 +02:00