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 a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
v1	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
web	Suppress CSRF token warnings (#6240)	7 years ago
base_controller.rb	Refactor /api/web APIs to use the centralized axios instance (#6223)	7 years ago
oembed_controller.rb	Update status embeds (#4742)	7 years ago
push_controller.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	7 years ago
salmon_controller.rb	Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)	7 years ago
subscriptions_controller.rb	HTTP signatures (#4146)	7 years ago