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 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		5 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	Fix admin-facing uses of inline CSS (#13575)	5 years ago
action_logs	Fix admin audit log crash due to glitch-soc theming changes	5 years ago
announcements	…
change_emails	…
custom_emojis	…
dashboard	…
domain_allows	…
domain_blocks	…
email_domain_blocks	…
instances	Fix admin-facing uses of inline CSS (#13575)	5 years ago
invites	…
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	Fix admin-facing uses of inline CSS (#13575)	5 years ago
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	…