Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-11 09:17:21 +00:00
parent 0c2a16fcbf b6003afcdb
commit a0724cd742
12 changed files with 133 additions and 41 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -11,7 +11,7 @@
    %meta{ name: 'theme-color', content: '#282c37' }/
    %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/

-    %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp, ' - ', title]) : title
+    %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title

    = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
    - if @theme