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 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		7 years ago
..
activitypub	Handle stream_entry URL correctly in ActivityPub (#4854)	7 years ago
ostatus	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	7 years ago
settings	Refactor Setting (#3302)	7 years ago
application_extension.rb	Conditional validations no longer accept strings for if/unless (#3124)	7 years ago
emoji.rb	Change RuboCop rules to loose (#4464)	7 years ago
exceptions.rb	Add callback_url/acct information for Sidekiq PuSH workers Exception. (#4281)	7 years ago
extractor.rb	Skip formatting for cashtag in status text (#3275)	7 years ago
feed_manager.rb	Merge upstream (#81)	7 years ago
formatter.rb	Don't normalize invalid domain names (#4499)	7 years ago
frontmatter_handler.rb	createBio function added	7 years ago
hash_object.rb	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	7 years ago
inline_renderer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
language_detector.rb	Fix language filter codes (#4841)	7 years ago
provider_discovery.rb	HTTP signatures (#4146)	7 years ago
request.rb	Add Digest header to requests with body, handle acct and URI keyId (#4565)	7 years ago
sanitize_config.rb	Whitelist allowed classes for federated statuses (#3810)	7 years ago
status_filter.rb	Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)	7 years ago
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
tag_manager.rb	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	7 years ago
user_settings_decorator.rb	Add unfollow modal (optional) (#4246)	7 years ago
webfinger_resource.rb	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)	7 years ago