This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
v2	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
web	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
base_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
oembed_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
proofs_controller_spec.rb	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
push_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
salmon_controller_spec.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
subscriptions_controller_spec.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00