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
..
admin	Fix admin actions log crash when displaying updates of deleted announcements (#13489)	5 years ago
settings	…
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	5 years ago
flashes_helper.rb	…
home_helper.rb	Fix use of inline CSS in public pages (#13576)	5 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	5 years ago
settings_helper.rb	Add `vi` to available locales (#13542)	5 years ago
statuses_helper.rb	Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545)	5 years ago
webfinger_helper.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago