Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
29b40db5
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,体验更适合开发者的 AI 搜索 >>
提交
29b40db5
编写于
8月 30, 2017
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More review comments
上级
eb05bdc6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
3 deletion
+13
-3
app/helpers/form_helper.rb
app/helpers/form_helper.rb
+0
-1
app/models/application_setting.rb
app/models/application_setting.rb
+2
-0
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+2
-2
doc/security/img/ssh_keys_restrictions_settings.png
doc/security/img/ssh_keys_restrictions_settings.png
+0
-0
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+9
-0
未找到文件。
app/helpers/form_helper.rb
浏览文件 @
29b40db5
...
...
@@ -3,7 +3,6 @@ module FormHelper
return
unless
model
.
errors
.
any?
pluralized
=
'error'
.
pluralize
(
model
.
errors
.
count
)
headline
=
"The
#{
type
}
contains the following
#{
pluralized
}
:"
content_tag
(
:div
,
class:
'alert alert-danger'
,
id:
'error_explanation'
)
do
...
...
app/models/application_setting.rb
浏览文件 @
29b40db5
...
...
@@ -155,6 +155,8 @@ class ApplicationSetting < ActiveRecord::Base
validates
:"
#{
type
}
_key_restriction"
,
presence:
true
,
key_restriction:
{
type:
type
}
end
validates
:allowed_key_types
,
presence:
true
validates_each
:restricted_visibility_levels
do
|
record
,
attr
,
value
|
value
&
.
each
do
|
level
|
unless
Gitlab
::
VisibilityLevel
.
options
.
value?
(
level
)
...
...
app/views/profiles/keys/_key.html.haml
浏览文件 @
29b40db5
...
...
@@ -3,8 +3,8 @@
-
if
key
.
valid?
=
icon
'key'
,
class:
'settings-list-icon hidden-xs'
-
else
=
icon
'exclamation-triangle'
,
class:
'settings-list-icon hidden-xs'
,
title:
'The key is disabled because it is invalid'
=
icon
'exclamation-triangle'
,
class:
'settings-list-icon hidden-xs
has-tooltip
'
,
title:
key
.
errors
.
full_messages
.
join
(
', '
)
.key-list-item-info
...
...
doc/security/img/ssh_keys_restrictions_settings.png
查看替换文件 @
eb05bdc6
浏览文件 @
29b40db5
13.4 KB
|
W:
|
H:
66.9 KB
|
W:
|
H:
2-up
Swipe
Onion skin
spec/models/application_setting_spec.rb
浏览文件 @
29b40db5
...
...
@@ -77,6 +77,15 @@ describe ApplicationSetting do
expect
(
described_class
::
SUPPORTED_KEY_TYPES
).
to
contain_exactly
(
:rsa
,
:dsa
,
:ecdsa
,
:ed25519
)
end
it
'does not allow all key types to be disabled'
do
described_class
::
SUPPORTED_KEY_TYPES
.
each
do
|
type
|
setting
[
"
#{
type
}
_key_restriction"
]
=
described_class
::
FORBIDDEN_KEY_VALUE
end
expect
(
setting
).
not_to
be_valid
expect
(
setting
.
errors
.
messages
).
to
have_key
(
:allowed_key_types
)
end
where
(
:type
)
do
described_class
::
SUPPORTED_KEY_TYPES
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录