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

Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		7 years ago
..
activitypub	Create Redisable#redis (#9633)	7 years ago
ostatus	Create Redisable#redis (#9633)	7 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
activity_tracker.rb	Create Redisable#redis (#9633)	7 years ago
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	7 years ago
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
formatter.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	7 years ago
hash_object.rb	…
inline_renderer.rb	Add conversations API (#8832)	7 years ago
language_detector.rb	Leave unknown language as nil if account is remote (#8861)	7 years ago
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	7 years ago
request.rb	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	7 years ago
rss_builder.rb	…
sanitize_config.rb	…
sidekiq_error_handler.rb	…
status_filter.rb	…
status_finder.rb	…
tag_manager.rb	…
themes.rb	Allow selecting both default flavour and theme	7 years ago
user_settings_decorator.rb	Make displaying application used to toot opt-in (#9897)	7 years ago
webfinger_resource.rb	…