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 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		7 years ago
..
activitypub	Fix response of signature_verification_failure_reason (#6441)	7 years ago
admin	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
api	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
auth	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
concerns	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	7 years ago
oauth	change pack to 'auth'	7 years ago
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
well_known	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)	7 years ago
about_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
application_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
authorize_follows_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
emojis_controller.rb	Cache JSON of immutable ActivityPub representations (#6171)	7 years ago
follower_accounts_controller.rb	Finalized theme loading and stuff	7 years ago
following_accounts_controller.rb	Finalized theme loading and stuff	7 years ago
home_controller.rb	Finalized theme loading and stuff	7 years ago
intents_controller.rb	Add protocol handler. Handle follow intents (#4511)	7 years ago
invites_controller.rb	Use settings pack for InvitesController (#229)	7 years ago
manifests_controller.rb	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
media_controller.rb	…
media_proxy_controller.rb	Fix incomplete account records being read (#4998)	7 years ago
remote_follow_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
shares_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
statuses_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
stream_entries_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
tags_controller.rb	Finalized theme loading and stuff	7 years ago