From: Claire Date: Wed, 24 Mar 2021 09:53:50 +0000 (+0100) Subject: Merge branch 'main' into glitch-soc/merge-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f60c99a8fb0c99554fce091cac61d9ed07eef573;p=mastodon.git Merge branch 'main' into glitch-soc/merge-upstream --- f60c99a8fb0c99554fce091cac61d9ed07eef573 diff --cc Gemfile.lock index 0f32a76b7,a62305dc0..9dc12a851 --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -768,12 -804,11 +805,12 @@@ DEPENDENCIE rack (~> 2.2.3) rack-attack (~> 6.5) rack-cors (~> 1.1) - rails (~> 5.2.4.5) + rails (~> 6.1.3) rails-controller-testing (~> 1.0) - rails-i18n (~> 5.1) + rails-i18n (~> 6.0) rails-settings-cached (~> 0.6) rdf-normalize (~> 0.4) + redcarpet (~> 3.5) redis (~> 4.2) redis-namespace (~> 1.8) rqrcode (~> 1.2) diff --cc app/views/layouts/application.html.haml index 32681773f,436024ee3..3daaf93a9 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@@ -32,15 -30,11 +32,15 @@@ = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style' + = yield :header_tags + + -# These must come after :header_tags to ensure our initial state has been defined. + = render partial: 'layouts/theme', object: @core + = render partial: 'layouts/theme', object: @theme + - if Setting.custom_css.present? - = stylesheet_link_tag custom_css_path, media: 'all' + = stylesheet_link_tag custom_css_path, host: request.host, media: 'all' - = yield :header_tags - %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield