Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6c49a628
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6c49a628
编写于
8月 17, 2017
作者:
R
Rubén Dávila
提交者:
Ruben Davila
9月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore some changes from !9199
上级
8d1321d6
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
197 addition
and
8 deletion
+197
-8
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-0
app/controllers/profiles/preferences_controller.rb
app/controllers/profiles/preferences_controller.rb
+2
-1
app/helpers/preferences_helper.rb
app/helpers/preferences_helper.rb
+4
-0
app/models/user.rb
app/models/user.rb
+1
-0
config/gitlab.yml.example
config/gitlab.yml.example
+9
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
doc/api/keys.md
doc/api/keys.md
+1
-0
doc/api/session.md
doc/api/session.md
+1
-0
doc/api/users.md
doc/api/users.md
+5
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/gitlab/themes.rb
lib/gitlab/themes.rb
+87
-0
spec/controllers/profiles/preferences_controller_spec.rb
spec/controllers/profiles/preferences_controller_spec.rb
+4
-2
spec/fixtures/api/schemas/public_api/v4/user/login.json
spec/fixtures/api/schemas/public_api/v4/user/login.json
+1
-0
spec/helpers/preferences_helper_spec.rb
spec/helpers/preferences_helper_spec.rb
+26
-0
spec/lib/gitlab/themes_spec.rb
spec/lib/gitlab/themes_spec.rb
+48
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-0
spec/support/gitlab_stubs/session.json
spec/support/gitlab_stubs/session.json
+1
-1
spec/support/gitlab_stubs/user.json
spec/support/gitlab_stubs/user.json
+2
-2
未找到文件。
app/controllers/admin/users_controller.rb
浏览文件 @
6c49a628
...
...
@@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController
:provider
,
:remember_me
,
:skype
,
:theme_id
,
:twitter
,
:username
,
:website_url
...
...
app/controllers/profiles/preferences_controller.rb
浏览文件 @
6c49a628
...
...
@@ -35,7 +35,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController
:color_scheme_id
,
:layout
,
:dashboard
,
:project_view
:project_view
,
:theme_id
)
end
end
app/helpers/preferences_helper.rb
浏览文件 @
6c49a628
...
...
@@ -40,6 +40,10 @@ module PreferencesHelper
]
end
def
user_application_theme
Gitlab
::
Themes
.
for_user
(
current_user
).
css_class
end
def
user_color_scheme
Gitlab
::
ColorSchemes
.
for_user
(
current_user
).
css_class
end
...
...
app/models/user.rb
浏览文件 @
6c49a628
...
...
@@ -35,6 +35,7 @@ class User < ActiveRecord::Base
default_value_for
:project_view
,
:files
default_value_for
:notified_of_own_activity
,
false
default_value_for
:preferred_language
,
I18n
.
default_locale
default_value_for
:theme_id
,
gitlab_config
.
default_theme
attr_encrypted
:otp_secret
,
key:
Gitlab
::
Application
.
secrets
.
otp_key_base
,
...
...
config/gitlab.yml.example
浏览文件 @
6c49a628
...
...
@@ -76,6 +76,14 @@ production: &base
# default_can_create_group: false # default: true
# username_changing_enabled: false # default: true - User can change her username/namespace
## Default theme ID
## 1 - Graphite
## 2 - Charcoal
## 3 - Green
## 4 - Gray
## 5 - Violet
## 6 - Blue
# default_theme: 2 # default: 2
## Automatic issue closing
# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
...
...
@@ -741,4 +749,4 @@ test:
admin_group: ''
staging:
<<: *base
<<: *base
\ No newline at end of file
config/initializers/1_settings.rb
浏览文件 @
6c49a628
...
...
@@ -232,6 +232,7 @@ Settings['gitlab'] ||= Settingslogic.new({})
Settings
.
gitlab
[
'default_projects_limit'
]
||=
100000
Settings
.
gitlab
[
'default_branch_protection'
]
||=
2
Settings
.
gitlab
[
'default_can_create_group'
]
=
true
if
Settings
.
gitlab
[
'default_can_create_group'
].
nil?
Settings
.
gitlab
[
'default_theme'
]
=
Gitlab
::
Themes
::
APPLICATION_DEFAULT
if
Settings
.
gitlab
[
'default_theme'
].
nil?
Settings
.
gitlab
[
'host'
]
||=
ENV
[
'GITLAB_HOST'
]
||
'localhost'
Settings
.
gitlab
[
'ssh_host'
]
||=
Settings
.
gitlab
.
host
Settings
.
gitlab
[
'https'
]
=
false
if
Settings
.
gitlab
[
'https'
].
nil?
...
...
doc/api/keys.md
浏览文件 @
6c49a628
...
...
@@ -32,6 +32,7 @@ Parameters:
"twitter"
:
""
,
"website_url"
:
""
,
"email"
:
"john@example.com"
,
"theme_id"
:
2
,
"color_scheme_id"
:
1
,
"projects_limit"
:
10
,
"current_sign_in_at"
:
null
,
...
...
doc/api/session.md
浏览文件 @
6c49a628
...
...
@@ -39,6 +39,7 @@ Example response:
"twitter"
:
""
,
"website_url"
:
""
,
"email"
:
"john@example.com"
,
"theme_id"
:
1
,
"color_scheme_id"
:
1
,
"projects_limit"
:
10
,
"current_sign_in_at"
:
"2015-07-07T07:10:58.392Z"
,
...
...
doc/api/users.md
浏览文件 @
6c49a628
...
...
@@ -72,6 +72,7 @@ GET /users
"organization"
:
""
,
"last_sign_in_at"
:
"2012-06-01T11:41:01Z"
,
"confirmed_at"
:
"2012-05-23T09:05:22Z"
,
"theme_id"
:
1
,
"last_activity_on"
:
"2012-05-23"
,
"color_scheme_id"
:
2
,
"projects_limit"
:
100
,
...
...
@@ -105,6 +106,7 @@ GET /users
"organization"
:
""
,
"last_sign_in_at"
:
null
,
"confirmed_at"
:
"2012-05-30T16:53:06.148Z"
,
"theme_id"
:
1
,
"last_activity_on"
:
"2012-05-23"
,
"color_scheme_id"
:
3
,
"projects_limit"
:
100
,
...
...
@@ -215,6 +217,7 @@ Parameters:
"organization"
:
""
,
"last_sign_in_at"
:
"2012-06-01T11:41:01Z"
,
"confirmed_at"
:
"2012-05-23T09:05:22Z"
,
"theme_id"
:
1
,
"last_activity_on"
:
"2012-05-23"
,
"color_scheme_id"
:
2
,
"projects_limit"
:
100
,
...
...
@@ -341,6 +344,7 @@ GET /user
"organization"
:
""
,
"last_sign_in_at"
:
"2012-06-01T11:41:01Z"
,
"confirmed_at"
:
"2012-05-23T09:05:22Z"
,
"theme_id"
:
1
,
"last_activity_on"
:
"2012-05-23"
,
"color_scheme_id"
:
2
,
"projects_limit"
:
100
,
...
...
@@ -387,6 +391,7 @@ GET /user
"organization"
:
""
,
"last_sign_in_at"
:
"2012-06-01T11:41:01Z"
,
"confirmed_at"
:
"2012-05-23T09:05:22Z"
,
"theme_id"
:
1
,
"last_activity_on"
:
"2012-05-23"
,
"color_scheme_id"
:
2
,
"projects_limit"
:
100
,
...
...
lib/api/entities.rb
浏览文件 @
6c49a628
...
...
@@ -35,7 +35,7 @@ module API
expose
:confirmed_at
expose
:last_activity_on
expose
:email
expose
:color_scheme_id
,
:projects_limit
,
:current_sign_in_at
expose
:
theme_id
,
:
color_scheme_id
,
:projects_limit
,
:current_sign_in_at
expose
:identities
,
using:
Entities
::
Identity
expose
:can_create_group?
,
as: :can_create_group
expose
:can_create_project?
,
as: :can_create_project
...
...
lib/gitlab/themes.rb
0 → 100644
浏览文件 @
6c49a628
module
Gitlab
# Module containing GitLab's application theme definitions and helper methods
# for accessing them.
module
Themes
extend
self
# Theme ID used when no `default_theme` configuration setting is provided.
APPLICATION_DEFAULT
=
2
# Struct class representing a single Theme
Theme
=
Struct
.
new
(
:id
,
:name
,
:css_class
)
# All available Themes
THEMES
=
[
Theme
.
new
(
1
,
'Graphite'
,
'ui_graphite'
),
Theme
.
new
(
2
,
'Charcoal'
,
'ui_charcoal'
),
Theme
.
new
(
3
,
'Green'
,
'ui_green'
),
Theme
.
new
(
4
,
'Black'
,
'ui_black'
),
Theme
.
new
(
5
,
'Violet'
,
'ui_violet'
),
Theme
.
new
(
6
,
'Blue'
,
'ui_blue'
)
].
freeze
# Convenience method to get a space-separated String of all the theme
# classes that might be applied to the `body` element
#
# Returns a String
def
body_classes
THEMES
.
collect
(
&
:css_class
).
uniq
.
join
(
' '
)
end
# Get a Theme by its ID
#
# If the ID is invalid, returns the default Theme.
#
# id - Integer ID
#
# Returns a Theme
def
by_id
(
id
)
THEMES
.
detect
{
|
t
|
t
.
id
==
id
}
||
default
end
# Returns the number of defined Themes
def
count
THEMES
.
size
end
# Get the default Theme
#
# Returns a Theme
def
default
by_id
(
default_id
)
end
# Iterate through each Theme
#
# Yields the Theme object
def
each
(
&
block
)
THEMES
.
each
(
&
block
)
end
# Get the Theme for the specified user, or the default
#
# user - User record
#
# Returns a Theme
def
for_user
(
user
)
if
user
by_id
(
user
.
theme_id
)
else
default
end
end
private
def
default_id
id
=
Gitlab
.
config
.
gitlab
.
default_theme
.
to_i
# Prevent an invalid configuration setting from causing an infinite loop
if
id
<
THEMES
.
first
.
id
||
id
>
THEMES
.
last
.
id
APPLICATION_DEFAULT
else
id
end
end
end
end
spec/controllers/profiles/preferences_controller_spec.rb
浏览文件 @
6c49a628
...
...
@@ -25,7 +25,8 @@ describe Profiles::PreferencesController do
def
go
(
params:
{},
format: :js
)
params
.
reverse_merge!
(
color_scheme_id:
'1'
,
dashboard:
'stars'
dashboard:
'stars'
,
theme_id:
'1'
)
patch
:update
,
user:
params
,
format:
format
...
...
@@ -40,7 +41,8 @@ describe Profiles::PreferencesController do
it
"changes the user's preferences"
do
prefs
=
{
color_scheme_id:
'1'
,
dashboard:
'stars'
dashboard:
'stars'
,
theme_id:
'2'
}.
with_indifferent_access
expect
(
user
).
to
receive
(
:assign_attributes
).
with
(
prefs
)
...
...
spec/fixtures/api/schemas/public_api/v4/user/login.json
浏览文件 @
6c49a628
...
...
@@ -19,6 +19,7 @@
"organization"
,
"last_sign_in_at"
,
"confirmed_at"
,
"theme_id"
,
"color_scheme_id"
,
"projects_limit"
,
"current_sign_in_at"
,
...
...
spec/helpers/preferences_helper_spec.rb
浏览文件 @
6c49a628
...
...
@@ -26,6 +26,32 @@ describe PreferencesHelper do
end
end
describe
'user_application_theme'
do
context
'with a user'
do
it
"returns user's theme's css_class"
do
stub_user
(
theme_id:
3
)
expect
(
helper
.
user_application_theme
).
to
eq
'ui_green'
end
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
)
expect
(
helper
.
user_application_theme
).
to
eq
'ui_charcoal'
end
end
context
'without a user'
do
it
'returns the default theme'
do
stub_user
expect
(
helper
.
user_application_theme
).
to
eq
Gitlab
::
Themes
.
default
.
css_class
end
end
end
describe
'user_color_scheme'
do
context
'with a user'
do
it
"returns user's scheme's css_class"
do
...
...
spec/lib/gitlab/themes_spec.rb
0 → 100644
浏览文件 @
6c49a628
require
'spec_helper'
describe
Gitlab
::
Themes
,
lib:
true
do
describe
'.body_classes'
do
it
'returns a space-separated list of class names'
do
css
=
described_class
.
body_classes
expect
(
css
).
to
include
(
'ui_graphite'
)
expect
(
css
).
to
include
(
' ui_charcoal '
)
expect
(
css
).
to
include
(
' ui_blue'
)
end
end
describe
'.by_id'
do
it
'returns a Theme by its ID'
do
expect
(
described_class
.
by_id
(
1
).
name
).
to
eq
'Graphite'
expect
(
described_class
.
by_id
(
6
).
name
).
to
eq
'Blue'
end
end
describe
'.default'
do
it
'returns the default application theme'
do
allow
(
described_class
).
to
receive
(
:default_id
).
and_return
(
2
)
expect
(
described_class
.
default
.
id
).
to
eq
2
end
it
'prevents an infinite loop when configuration default is invalid'
do
default
=
described_class
::
APPLICATION_DEFAULT
themes
=
described_class
::
THEMES
config
=
double
(
default_theme:
0
).
as_null_object
allow
(
Gitlab
).
to
receive
(
:config
).
and_return
(
config
)
expect
(
described_class
.
default
.
id
).
to
eq
default
config
=
double
(
default_theme:
themes
.
size
+
5
).
as_null_object
allow
(
Gitlab
).
to
receive
(
:config
).
and_return
(
config
)
expect
(
described_class
.
default
.
id
).
to
eq
default
end
end
describe
'.each'
do
it
'passes the block to the THEMES Array'
do
ids
=
[]
described_class
.
each
{
|
theme
|
ids
<<
theme
.
id
}
expect
(
ids
).
not_to
be_empty
end
end
end
spec/models/user_spec.rb
浏览文件 @
6c49a628
...
...
@@ -716,6 +716,7 @@ describe User do
it
"applies defaults to user"
do
expect
(
user
.
projects_limit
).
to
eq
(
Gitlab
.
config
.
gitlab
.
default_projects_limit
)
expect
(
user
.
can_create_group
).
to
eq
(
Gitlab
.
config
.
gitlab
.
default_can_create_group
)
expect
(
user
.
theme_id
).
to
eq
(
Gitlab
.
config
.
gitlab
.
default_theme
)
expect
(
user
.
external
).
to
be_falsey
end
end
...
...
@@ -726,6 +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
(
1
)
end
end
...
...
spec/support/gitlab_stubs/session.json
浏览文件 @
6c49a628
...
...
@@ -7,7 +7,7 @@
"skype"
:
"aertert"
,
"linkedin"
:
""
,
"twitter"
:
""
,
"color_scheme_id"
:
2
,
"
theme_id"
:
2
,
"
color_scheme_id"
:
2
,
"state"
:
"active"
,
"created_at"
:
"2012-12-21T13:02:20Z"
,
"extern_uid"
:
null
,
...
...
spec/support/gitlab_stubs/user.json
浏览文件 @
6c49a628
...
...
@@ -7,7 +7,7 @@
"skype"
:
"aertert"
,
"linkedin"
:
""
,
"twitter"
:
""
,
"color_scheme_id"
:
2
,
"
theme_id"
:
2
,
"
color_scheme_id"
:
2
,
"state"
:
"active"
,
"created_at"
:
"2012-12-21T13:02:20Z"
,
"extern_uid"
:
null
,
...
...
@@ -17,4 +17,4 @@
"can_create_project"
:
false
,
"private_token"
:
"Wvjy2Krpb7y8xi93owUz"
,
"access_token"
:
"Wvjy2Krpb7y8xi93owUz"
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录