Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
de2ae315
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 搜索 >>
提交
de2ae315
编写于
10月 02, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
4f4dcd3c
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
37 addition
and
24 deletion
+37
-24
CHANGELOG-EE.md
CHANGELOG-EE.md
+8
-0
CHANGELOG.md
CHANGELOG.md
+8
-0
app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue
...pts/vue_shared/components/issue/related_issuable_item.vue
+2
-1
app/assets/stylesheets/framework/contextual_sidebar.scss
app/assets/stylesheets/framework/contextual_sidebar.scss
+2
-2
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+1
-3
changelogs/unreleased/26210-toc-links.yml
changelogs/unreleased/26210-toc-links.yml
+5
-0
changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml
...elogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml
+0
-5
changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml
...sed/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml
+0
-5
lib/banzai/filter/table_of_contents_filter.rb
lib/banzai/filter/table_of_contents_filter.rb
+3
-2
qa/qa/page/project/issue/show.rb
qa/qa/page/project/issue/show.rb
+3
-3
spec/lib/banzai/filter/table_of_contents_filter_spec.rb
spec/lib/banzai/filter/table_of_contents_filter_spec.rb
+3
-1
spec/models/pages_domain_spec.rb
spec/models/pages_domain_spec.rb
+1
-1
spec/validators/named_ecdsa_key_validator_spec.rb
spec/validators/named_ecdsa_key_validator_spec.rb
+1
-1
未找到文件。
CHANGELOG-EE.md
浏览文件 @
de2ae315
Please view this file on the master branch, on stable branches it's out of date.
## 12.3.4
### Fixed (2 changes)
-
Fix replies to service desk emails for projects with issue access as Only Project Members. !17401
-
Geo: LFS not being synced. !17633
## 12.3.2
### Security (2 changes)
...
...
CHANGELOG.md
浏览文件 @
de2ae315
...
...
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 12.3.4
### Fixed (2 changes)
- Fix cannot merge icon showing in dropdown for users who can merge. !17306
- Fix pipelines for merge requests in project exports. !17844
## 12.3.2
### Security (12 changes)
...
...
app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue
浏览文件 @
de2ae315
...
...
@@ -159,7 +159,8 @@ export default {
v-gl-tooltip
:disabled=
"removeDisabled"
type=
"button"
class=
"btn btn-default btn-svg btn-item-remove js-issue-item-remove-button qa-remove-issue-button mr-xl-0 align-self-xl-center"
class=
"btn btn-default btn-svg btn-item-remove js-issue-item-remove-button mr-xl-0 align-self-xl-center"
data-qa-selector=
"remove_related_issue_button"
:title=
"__('Remove')"
:aria-label=
"__('Remove')"
@
click=
"onRemoveRequest"
...
...
app/assets/stylesheets/framework/contextual_sidebar.scss
浏览文件 @
de2ae315
...
...
@@ -177,7 +177,7 @@
transition
:
padding
$sidebar-transition-duration
;
display
:
flex
;
align-items
:
center
;
padding
:
12px
15px
;
padding
:
12px
$gl-padding
;
color
:
$gl-text-color-secondary
;
}
...
...
@@ -341,7 +341,7 @@
>
a
{
margin-left
:
4px
;
// Subtract width of left border on active element
padding-left
:
11px
;
padding-left
:
$gl-padding-12
;
}
.badge.badge-pill
{
...
...
app/views/layouts/nav/_dashboard.html.haml
浏览文件 @
de2ae315
...
...
@@ -17,8 +17,6 @@
.dropdown-menu.frequent-items-dropdown-menu
=
render
"layouts/nav/groups_dropdown/show"
=
render_if_exists
'layouts/nav/sidebar/analytics_link'
-
if
any_dashboard_nav_link?
([
:groups
,
:milestones
,
:activity
,
:snippets
])
%li
.header-more.dropdown
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
,
qa_selector:
'more_dropdown'
}
}
...
...
@@ -45,7 +43,7 @@
=
link_to
dashboard_snippets_path
,
class:
'dashboard-shortcuts-snippets'
,
data:
{
qa_selector:
'snippets_link'
}
do
=
_
(
'Snippets'
)
=
render_if_exists
'layouts/nav/sidebar/analytics_
more_
link'
=
render_if_exists
'layouts/nav/sidebar/analytics_link'
%li
.dropdown
=
render_if_exists
'dashboard/nav_link_list'
...
...
changelogs/unreleased/26210-toc-links.yml
0 → 100644
浏览文件 @
de2ae315
---
title
:
Fix issue with wiki TOC links being treated as external links
merge_request
:
author
:
Oren Kanner
type
:
fixed
changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml
已删除
100644 → 0
浏览文件 @
4f4dcd3c
---
title
:
Fix cannot merge icon showing in dropdown for users who can merge
merge_request
:
17306
author
:
type
:
fixed
changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml
已删除
100644 → 0
浏览文件 @
4f4dcd3c
---
title
:
Fix pipelines for merge requests in project exports
merge_request
:
17844
author
:
type
:
fixed
lib/banzai/filter/table_of_contents_filter.rb
浏览文件 @
de2ae315
...
...
@@ -56,7 +56,8 @@ module Banzai
private
def
anchor_tag
(
href
)
%Q{<a id="user-content-
#{
href
}
" class="anchor" href="#
#{
href
}
" aria-hidden="true"></a>}
escaped_href
=
CGI
.
escape
(
href
)
# account for non-ASCII characters
%Q{<a id="user-content-
#{
href
}
" class="anchor" href="#
#{
escaped_href
}
" aria-hidden="true"></a>}
end
def
push_toc
(
children
,
root:
false
)
...
...
@@ -80,7 +81,7 @@ module Banzai
def
initialize
(
node:
nil
,
href:
nil
,
previous_header:
nil
)
@node
=
node
@href
=
href
@href
=
CGI
.
escape
(
href
)
if
href
@children
=
[]
@parent
=
find_parent
(
previous_header
)
...
...
qa/qa/page/project/issue/show.rb
浏览文件 @
de2ae315
...
...
@@ -36,7 +36,7 @@ module QA
end
view
'app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue'
do
element
:remove_issue_button
element
:remove_
related_
issue_button
end
view
'app/helpers/dropdowns_helper.rb'
do
...
...
@@ -80,8 +80,8 @@ module QA
click_element
(
:milestone_link
)
end
def
click_remove_issue_button
click_element
(
:remove_issue_button
)
def
click_remove_
related_
issue_button
click_element
(
:remove_
related_
issue_button
)
end
# Adds a comment to an issue
...
...
spec/lib/banzai/filter/table_of_contents_filter_spec.rb
浏览文件 @
de2ae315
...
...
@@ -82,7 +82,9 @@ describe Banzai::Filter::TableOfContentsFilter do
it
'supports Unicode'
do
doc
=
filter
(
header
(
1
,
'한글'
))
expect
(
doc
.
css
(
'h1 a'
).
first
.
attr
(
'id'
)).
to
eq
'user-content-한글'
expect
(
doc
.
css
(
'h1 a'
).
first
.
attr
(
'href'
)).
to
eq
'#한글'
# check that we encode the href to avoid issues with the
# ExternalLinkFilter (see https://gitlab.com/gitlab-org/gitlab/issues/26210)
expect
(
doc
.
css
(
'h1 a'
).
first
.
attr
(
'href'
)).
to
eq
"#
#{
CGI
.
escape
(
'한글'
)
}
"
end
end
end
...
...
spec/models/pages_domain_spec.rb
浏览文件 @
de2ae315
...
...
@@ -160,7 +160,7 @@ describe PagesDomain do
end
context
'when curve is set explicitly by parameters'
do
it
'adds errors to private key'
do
it
'adds errors to private key'
,
:quarantine
do
domain
=
build
(
:pages_domain
,
:explicit_ecdsa
)
expect
(
domain
).
to
be_invalid
...
...
spec/validators/named_ecdsa_key_validator_spec.rb
浏览文件 @
de2ae315
...
...
@@ -43,7 +43,7 @@ describe NamedEcdsaKeyValidator do
context
'with ECDSA certificate with explicit curve params'
do
let
(
:value
)
{
attributes_for
(
:pages_domain
,
:explicit_ecdsa
)[
:key
]
}
it
'adds errors'
do
it
'adds errors'
,
:quarantine
do
expect
(
value
).
to
be_present
subject
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录