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.

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.		6 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_avatar.rb	Add WebP support (#9879)	6 years ago
account_counters.rb	Add profile directory (#9427)	6 years ago
account_finder_concern.rb	Use Contact User as Relay, Report, Subscribe. (#9661)	6 years ago
account_header.rb	Add WebP support (#9879)	6 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	7 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
domain_normalizable.rb	Add option to overwrite imported data (#9962)	6 years ago
expireable.rb	Fix low-hanging rubocop gripes (#8458)	6 years ago
omniauthable.rb	Fix SSO authentication not working due to missing agreement boolean (#9915)	6 years ago
paginable.rb	Fix timeline pagination (#8827)	6 years ago
redisable.rb	Create Redisable#redis (#9633)	6 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Fix nil host in remotable (#8508)	6 years ago
status_threading_concern.rb	Sort self-replies to the top of descendants (#9320)	6 years ago
streamable.rb	Define instance method outside #included (#3128)	8 years ago