Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4d482b3b
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,发现更多精彩内容 >>
提交
4d482b3b
编写于
6月 25, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'version-file' into 'master'
Version file Fixes #1345
上级
10a33f0f
af7e7798
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
0 deletion
+36
-0
app/models/repository.rb
app/models/repository.rb
+13
-0
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+6
-0
features/project/project.feature
features/project/project.feature
+5
-0
features/steps/project/project.rb
features/steps/project/project.rb
+12
-0
未找到文件。
app/models/repository.rb
浏览文件 @
4d482b3b
...
...
@@ -128,6 +128,7 @@ class Repository
Rails
.
cache
.
delete
(
cache_key
(
:commit_count
))
Rails
.
cache
.
delete
(
cache_key
(
:graph_log
))
Rails
.
cache
.
delete
(
cache_key
(
:readme
))
Rails
.
cache
.
delete
(
cache_key
(
:version
))
Rails
.
cache
.
delete
(
cache_key
(
:contribution_guide
))
end
...
...
@@ -156,12 +157,24 @@ class Repository
Gitlab
::
Git
::
Blob
.
find
(
self
,
sha
,
path
)
end
def
blob_by_oid
(
oid
)
Gitlab
::
Git
::
Blob
.
raw
(
self
,
oid
)
end
def
readme
Rails
.
cache
.
fetch
(
cache_key
(
:readme
))
do
tree
(
:head
).
readme
end
end
def
version
Rails
.
cache
.
fetch
(
cache_key
(
:version
))
do
tree
(
:head
).
blobs
.
find
do
|
file
|
file
.
name
.
downcase
==
'version'
end
end
end
def
contribution_guide
Rails
.
cache
.
fetch
(
cache_key
(
:contribution_guide
))
do
tree
(
:head
).
contribution_guide
...
...
app/views/projects/show.html.haml
浏览文件 @
4d482b3b
...
...
@@ -44,6 +44,12 @@
=
link_to
project_blob_path
(
@project
,
tree_join
(
@repository
.
root_ref
,
readme
.
name
)),
class:
'btn btn-block'
do
=
readme
.
name
-
if
@repository
.
version
-
version
=
@repository
.
version
=
link_to
project_blob_path
(
@project
,
tree_join
(
@repository
.
root_ref
,
version
.
name
)),
class:
'btn btn-block'
do
Version:
=
@repository
.
blob_by_oid
(
version
.
id
).
data
.prepend-top-10
%p
%span
.light
Created on
...
...
features/project/project.feature
浏览文件 @
4d482b3b
...
...
@@ -24,3 +24,8 @@ Feature: Project Feature
When
I visit edit project
"Shop"
page
And
change project path settings
Then
I should see project with new path settings
Scenario
:
I
should see project readme and version
When
I visit project
"Shop"
page
Then
I should see project
"Shop"
README link
And
I should see project
"Shop"
version
features/steps/project/project.rb
浏览文件 @
4d482b3b
...
...
@@ -24,4 +24,16 @@ class ProjectFeature < Spinach::FeatureSteps
step
'I should see project with new path settings'
do
project
.
path
.
should
==
"new-path"
end
step
'I should see project "Shop" README link'
do
within
'.project-side'
do
page
.
should
have_content
"README.md"
end
end
step
'I should see project "Shop" version'
do
within
'.project-side'
do
page
.
should
have_content
"Version: 2.2.0"
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录