summaryrefslogtreecommitdiff
path: root/app/helpers/preferences_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-26 11:33:44 -0700
committerRobert Speicher <rspeicher@gmail.com>2015-08-26 11:33:44 -0700
commit7a81dc65d9013dff4d8bf36cf78e027693703990 (patch)
tree9043449a7d4ca7cc8c74fa0f810ffc10eb606ee6 /app/helpers/preferences_helper.rb
parent2d72efcd9fb63f4bb0c6aed5a472a2eca2d6abac (diff)
downloadgitlab-ce-7a81dc65d9013dff4d8bf36cf78e027693703990.tar.gz
Re-add user_color_scheme helper
Update PreferencesHelper specs
Diffstat (limited to 'app/helpers/preferences_helper.rb')
-rw-r--r--app/helpers/preferences_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 51a6b3fa997..7f1b6a69926 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -30,7 +30,11 @@ module PreferencesHelper
end
def user_application_theme
- Gitlab::Themes.by_id(current_user.try(:theme_id)).css_class
+ Gitlab::Themes.for_user(current_user).css_class
+ end
+
+ def user_color_scheme
+ Gitlab::ColorSchemes.for_user(current_user).css_class
end
def prefer_readme?