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	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
concerns	Improvements to signature verification (#9667)	7 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Add a per-user setting to hide followers count	7 years ago
following_accounts_controller.rb	…
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	7 years ago
media_proxy_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
stream_entries_controller.rb	…
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago