Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
99dcf870
Commit
99dcf870
authored
Sep 07, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use indigo as default theme
parent
95415d99
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
lib/gitlab/themes.rb
lib/gitlab/themes.rb
+1
-1
spec/helpers/preferences_helper_spec.rb
spec/helpers/preferences_helper_spec.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
No files found.
lib/gitlab/themes.rb
View file @
99dcf870
...
...
@@ -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
)
...
...
spec/helpers/preferences_helper_spec.rb
View file @
99dcf870
...
...
@@ -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
...
...
spec/models/user_spec.rb
View file @
99dcf870
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment