You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		7 years ago
..
v1	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
web	Suppress CSRF token warnings (#6240)	7 years ago
base_controller.rb	Ensure that boolean params in the API are parsed for truthiness (#6575)	7 years ago
oembed_controller.rb	…
push_controller.rb	…
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller.rb	…