Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3e10e048
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,发现更多精彩内容 >>
提交
3e10e048
编写于
9月 13, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ce-backport-new-sidebar-boards' into 'master'
CE backport of new-sidebar-boards See merge request !14246
上级
33010da2
360b60be
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
8 deletion
+24
-8
app/helpers/boards_helper.rb
app/helpers/boards_helper.rb
+4
-0
app/views/layouts/nav/sidebar/_project.html.haml
app/views/layouts/nav/sidebar/_project.html.haml
+2
-2
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+18
-6
未找到文件。
app/helpers/boards_helper.rb
浏览文件 @
3e10e048
...
...
@@ -77,4 +77,8 @@ module BoardsHelper
'max-select'
:
dropdown_options
[
:data
][
:'max-select'
]
}
end
def
boards_link_text
_
(
"Board"
)
end
end
app/views/layouts/nav/sidebar/_project.html.haml
浏览文件 @
3e10e048
...
...
@@ -114,9 +114,9 @@
List
=
nav_link
(
controller: :boards
)
do
=
link_to
project_boards_path
(
@project
),
title:
'Board'
do
=
link_to
project_boards_path
(
@project
),
title:
boards_link_text
do
%span
Board
=
boards_link_text
.feature-highlight.js-feature-highlight
{
disabled:
true
,
data:
{
trigger:
'manual'
,
container:
'body'
,
toggle:
'popover'
,
placement:
'right'
,
highlight:
'issue-boards'
}
}
.feature-highlight-popover-content
=
render
'feature_highlight/issue_boards.svg'
...
...
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
浏览文件 @
3e10e048
require
'spec_helper'
describe
'layouts/nav/sidebar/_project'
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
assign
(
:project
,
project
)
assign
(
:repository
,
project
.
repository
)
allow
(
view
).
to
receive
(
:current_ref
).
and_return
(
'master'
)
allow
(
view
).
to
receive
(
:can?
).
and_return
(
true
)
end
describe
'issue boards'
do
it
'has boards tab when multiple issue boards available'
do
render
expect
(
rendered
).
to
have_css
(
'a[title="Board"]'
)
end
end
describe
'container registry tab'
do
before
do
project
=
create
(
:project
,
:repository
)
stub_container_registry_config
(
enabled:
true
)
assign
(
:project
,
project
)
assign
(
:repository
,
project
.
repository
)
allow
(
view
).
to
receive
(
:current_ref
).
and_return
(
'master'
)
allow
(
view
).
to
receive
(
:can?
).
and_return
(
true
)
allow
(
controller
).
to
receive
(
:controller_name
)
.
and_return
(
'repositories'
)
allow
(
controller
).
to
receive
(
:controller_path
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录