Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e101b306
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 搜索 >>
提交
e101b306
编写于
12月 06, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@12-3-stable-ee
上级
7d2eede7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
35 addition
and
9 deletion
+35
-9
CHANGELOG-EE.md
CHANGELOG-EE.md
+16
-0
CHANGELOG.md
CHANGELOG.md
+6
-3
VERSION
VERSION
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+6
-0
spec/features/groups/settings/group_badges_spec.rb
spec/features/groups/settings/group_badges_spec.rb
+3
-2
spec/features/projects/settings/project_badges_spec.rb
spec/features/projects/settings/project_badges_spec.rb
+2
-2
spec/support/shared_examples/models/concern/issuable_shared_examples.rb
...hared_examples/models/concern/issuable_shared_examples.rb
+1
-1
未找到文件。
CHANGELOG-EE.md
浏览文件 @
e101b306
Please view this file on the master branch, on stable branches it's out of date.
## 12.3.8
-
No changes.
## 12.3.7
### Security (6 changes)
-
Protect Jira integration endpoints from guest users.
-
Fix private comment Elasticsearch leak on project search scope.
-
Filter snippet search results by feature visibility.
-
Hide AWS secret on Admin Integration page.
-
Fail pull mirror when mirror user is blocked.
-
Prevent IDOR when adding users to protected environments.
## 12.3.6
### Security (4 changes)
...
...
CHANGELOG.md
浏览文件 @
e101b306
...
...
@@ -8,17 +8,20 @@ entry.
## 12.3.7
### Security (
9
changes)
### Security (
12
changes)
- Check permissions before showing a forked project's source.
- Do not create todos for approvers without access. !1442
- Limit potential for DNS rebind SSRF in chat notifications.
- Encrypt application setting tokens.
- Update Workhorse and Gitaly to fix a security issue.
- Add maven file_name regex validation on incoming files.
- Hide commit counts from guest users in Cycle Analytics.
-
Limit potential for DNS rebind SSRF in chat notifications
.
-
Check permissions before showing a forked project's source
.
- Fix 500 error caused by invalid byte sequences in links.
- Ensure are cleaned by ImportExport::AttributeCleaner.
- Remove notes regarding Related Branches from Issue activity feeds for guest users.
- Escape namespace in label references to prevent XSS.
- Add authorization to using filter vulnerable in Dependency List.
## 12.3.6
...
...
VERSION
浏览文件 @
e101b306
12.3.8
12.3.8
-ee
locale/gitlab.pot
浏览文件 @
e101b306
...
...
@@ -666,6 +666,9 @@ msgstr ""
msgid "API Token"
msgstr ""
msgid "AWS Secret Access Key"
msgstr ""
msgid "Abort"
msgstr ""
...
...
@@ -5653,6 +5656,9 @@ msgstr ""
msgid "Enter merge request URLs"
msgstr ""
msgid "Enter new AWS Secret Access Key"
msgstr ""
msgid "Enter the issue description"
msgstr ""
...
...
spec/features/groups/settings/group_badges_spec.rb
浏览文件 @
e101b306
...
...
@@ -7,8 +7,9 @@ describe 'Group Badges' do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:badge_link_url
)
{
'https://gitlab.com/gitlab-org/gitlab/commits/master'
}
let
(
:badge_image_url
)
{
'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:badge_link_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/commits/master"
}
let
(
:badge_image_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/badges/master/pipeline.svg"
}
let!
(
:badge_1
)
{
create
(
:group_badge
,
group:
group
)
}
let!
(
:badge_2
)
{
create
(
:group_badge
,
group:
group
)
}
...
...
spec/features/projects/settings/project_badges_spec.rb
浏览文件 @
e101b306
...
...
@@ -8,8 +8,8 @@ describe 'Project Badges' do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:badge_link_url
)
{
'https://gitlab.com/gitlab-org/gitlab/commits/master'
}
let
(
:badge_image_url
)
{
'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'
}
let
(
:badge_link_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/commits/master"
}
let
(
:badge_image_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/badges/master/pipeline.svg"
}
let!
(
:project_badge
)
{
create
(
:project_badge
,
project:
project
)
}
let!
(
:group_badge
)
{
create
(
:group_badge
,
group:
group
)
}
...
...
spec/support/shared_examples/models/concern/issuable_shared_examples.rb
浏览文件 @
e101b306
...
...
@@ -2,7 +2,7 @@ shared_examples_for 'matches_cross_reference_regex? fails fast' do
it
'fails fast for long strings'
do
# took well under 1 second in CI https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/3267#note_172823
expect
do
Timeout
.
timeout
(
3
.
seconds
)
{
mentionable
.
matches_cross_reference_regex?
}
Timeout
.
timeout
(
6
.
seconds
)
{
mentionable
.
matches_cross_reference_regex?
}
end
.
not_to
raise_error
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录