summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-07 06:43:12 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-07 06:43:12 -0700
commit99dcf870dd46299ffec2e5067c9b3223de3315ce (patch)
treed03849885b0ca71fddc2bd1a2eee07ad9b00ea87
parent95415d99d603e0a6fc8755e1d360f8b913cdc8a4 (diff)
downloadgitlab-ce-99dcf870dd46299ffec2e5067c9b3223de3315ce.tar.gz
Use indigo as default theme
-rw-r--r--lib/gitlab/themes.rb2
-rw-r--r--spec/helpers/preferences_helper_spec.rb4
-rw-r--r--spec/models/user_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb
index e871557e243..37054d98102 100644
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
@@ -5,7 +5,7 @@ module Gitlab
extend self
# Theme ID used when no `default_theme` configuration setting is provided.
- APPLICATION_DEFAULT = 2
+ APPLICATION_DEFAULT = 1
# Struct class representing a single Theme
Theme = Struct.new(:id, :name, :css_class)
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb
index d85773306ab..69f0e8e2f9e 100644
--- a/spec/helpers/preferences_helper_spec.rb
+++ b/spec/helpers/preferences_helper_spec.rb
@@ -37,9 +37,9 @@ describe PreferencesHelper do
it 'returns the default when id is invalid' do
stub_user(theme_id: Gitlab::Themes.count + 5)
- allow(Gitlab.config.gitlab).to receive(:default_theme).and_return(2)
+ allow(Gitlab.config.gitlab).to receive(:default_theme).and_return(1)
- expect(helper.user_application_theme).to eq 'ui_dark'
+ expect(helper.user_application_theme).to eq 'ui_indigo'
end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 07db6435e13..961f891f559 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -727,7 +727,7 @@ describe User do
it "applies defaults to user" do
expect(user.projects_limit).to eq(123)
expect(user.can_create_group).to be_falsey
- expect(user.theme_id).to eq(2)
+ expect(user.theme_id).to eq(1)
end
end