Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d195db17
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 搜索 >>
提交
d195db17
编写于
7月 06, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't show auxiliary blob viewer for README when there is no wiki
上级
bb918a2f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
64 addition
and
1 deletion
+64
-1
app/models/blob_viewer/readme.rb
app/models/blob_viewer/readme.rb
+6
-0
app/models/project_wiki.rb
app/models/project_wiki.rb
+4
-0
app/views/projects/blob/viewers/_readme.html.haml
app/views/projects/blob/viewers/_readme.html.haml
+1
-1
changelogs/unreleased/dm-readme-auxiliary-blob-viewer-without-wiki.yml
...released/dm-readme-auxiliary-blob-viewer-without-wiki.yml
+4
-0
spec/models/blob_viewer/readme_spec.rb
spec/models/blob_viewer/readme_spec.rb
+49
-0
未找到文件。
app/models/blob_viewer/readme.rb
浏览文件 @
d195db17
...
...
@@ -10,5 +10,11 @@ module BlobViewer
def
visible_to?
(
current_user
)
can?
(
current_user
,
:read_wiki
,
project
)
end
def
render_error
return
if
project
.
has_external_wiki?
||
(
project
.
wiki_enabled?
&&
project
.
wiki
.
has_home_page?
)
:no_wiki
end
end
end
app/models/project_wiki.rb
浏览文件 @
d195db17
...
...
@@ -63,6 +63,10 @@ class ProjectWiki
!!
repository
.
exists?
end
def
has_home_page?
!!
find_page
(
'home'
)
end
# Returns an Array of Gitlab WikiPage instances or an
# empty Array if this Wiki has no pages.
def
pages
...
...
app/views/projects/blob/viewers/_readme.html.haml
浏览文件 @
d195db17
=
icon
(
'info-circle fw'
)
=
succeed
'.'
do
To learn more about this project, read
=
link_to
"the wiki"
,
project_wikis
_path
(
viewer
.
project
)
=
link_to
"the wiki"
,
get_project_wiki
_path
(
viewer
.
project
)
changelogs/unreleased/dm-readme-auxiliary-blob-viewer-without-wiki.yml
0 → 100644
浏览文件 @
d195db17
---
title
:
Don't show auxiliary blob viewer for README when there is no wiki
merge_request
:
author
:
spec/models/blob_viewer/readme_spec.rb
0 → 100644
浏览文件 @
d195db17
require
'spec_helper'
describe
BlobViewer
::
Readme
,
model:
true
do
include
FakeBlobHelpers
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:blob
)
{
fake_blob
(
path:
'README.md'
)
}
subject
{
described_class
.
new
(
blob
)
}
describe
'#render_error'
do
context
'when there is no wiki'
do
it
'returns :no_wiki'
do
expect
(
subject
.
render_error
).
to
eq
(
:no_wiki
)
end
end
context
'when there is an external wiki'
do
before
do
project
.
has_external_wiki
=
true
end
it
'returns nil'
do
expect
(
subject
.
render_error
).
to
be_nil
end
end
context
'when there is a local wiki'
do
before
do
project
.
wiki_enabled
=
true
end
context
'when the wiki is empty'
do
it
'returns :no_wiki'
do
expect
(
subject
.
render_error
).
to
eq
(
:no_wiki
)
end
end
context
'when the wiki is not empty'
do
before
do
WikiPages
::
CreateService
.
new
(
project
,
project
.
owner
,
title:
'home'
,
content:
'Home page'
).
execute
end
it
'returns nil'
do
expect
(
subject
.
render_error
).
to
be_nil
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录