Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		2020-09-01 17:02:18 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
v2	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
web	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
base_controller.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	2019-11-28 04:07:49 +01:00