Merge branch 'fix_default_navigation_theme_selection' into 'master'

Fix default navigation theme selection Closes #37777 See merge request !14260

Merge branch 'fix_default_navigation_theme_selection' into 'master'
fbe66a2b · Robert Speicher · Jarka Kadlecova · 0b18c472 · fbe66a2b
Commit fbe66a2b authored Sep 13, 2017 by Robert Speicher Committed by Jarka Kadlecova Sep 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

show.html.haml app/views/profiles/preferences/show.html.haml +1 -1

No files found.
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -17,7 +17,7 @@
          .preview-row
            .quadrant.three
            .quadrant.four
-        = f.radio_button :theme_id, theme.id
+        = f.radio_button :theme_id, theme.id, checked: Gitlab::Themes.for_user(@user).id == theme.id
        = theme.name

  .col-sm-12