Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ccb0c40c
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,发现更多精彩内容 >>
提交
ccb0c40c
编写于
11月 15, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make ProjectWiki touch Project#last_activity_at after wiki actions
Closes #3026
上级
43d5eca0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
0 deletion
+28
-0
app/models/project_wiki.rb
app/models/project_wiki.rb
+10
-0
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+18
-0
未找到文件。
app/models/project_wiki.rb
浏览文件 @
ccb0c40c
...
@@ -86,6 +86,8 @@ class ProjectWiki
...
@@ -86,6 +86,8 @@ class ProjectWiki
commit
=
commit_details
(
:created
,
message
,
title
)
commit
=
commit_details
(
:created
,
message
,
title
)
wiki
.
write_page
(
title
,
format
,
content
,
commit
)
wiki
.
write_page
(
title
,
format
,
content
,
commit
)
update_project_activity
rescue
Gollum
::
DuplicatePageError
=>
e
rescue
Gollum
::
DuplicatePageError
=>
e
@error_message
=
"Duplicate page:
#{
e
.
message
}
"
@error_message
=
"Duplicate page:
#{
e
.
message
}
"
return
false
return
false
...
@@ -95,10 +97,14 @@ class ProjectWiki
...
@@ -95,10 +97,14 @@ class ProjectWiki
commit
=
commit_details
(
:updated
,
message
,
page
.
title
)
commit
=
commit_details
(
:updated
,
message
,
page
.
title
)
wiki
.
update_page
(
page
,
page
.
name
,
format
,
content
,
commit
)
wiki
.
update_page
(
page
,
page
.
name
,
format
,
content
,
commit
)
update_project_activity
end
end
def
delete_page
(
page
,
message
=
nil
)
def
delete_page
(
page
,
message
=
nil
)
wiki
.
delete_page
(
page
,
commit_details
(
:deleted
,
message
,
page
.
title
))
wiki
.
delete_page
(
page
,
commit_details
(
:deleted
,
message
,
page
.
title
))
update_project_activity
end
end
def
page_title_and_dir
(
title
)
def
page_title_and_dir
(
title
)
...
@@ -146,4 +152,8 @@ class ProjectWiki
...
@@ -146,4 +152,8 @@ class ProjectWiki
def
path_to_repo
def
path_to_repo
@path_to_repo
||=
File
.
join
(
Gitlab
.
config
.
gitlab_shell
.
repos_path
,
"
#{
path_with_namespace
}
.git"
)
@path_to_repo
||=
File
.
join
(
Gitlab
.
config
.
gitlab_shell
.
repos_path
,
"
#{
path_with_namespace
}
.git"
)
end
end
def
update_project_activity
@project
.
touch
(
:last_activity_at
)
end
end
end
spec/models/project_wiki_spec.rb
浏览文件 @
ccb0c40c
...
@@ -184,6 +184,12 @@ describe ProjectWiki do
...
@@ -184,6 +184,12 @@ describe ProjectWiki do
subject
.
create_page
(
"test page"
,
"some content"
,
:markdown
,
"commit message"
)
subject
.
create_page
(
"test page"
,
"some content"
,
:markdown
,
"commit message"
)
expect
(
subject
.
pages
.
first
.
page
.
version
.
message
).
to
eq
(
"commit message"
)
expect
(
subject
.
pages
.
first
.
page
.
version
.
message
).
to
eq
(
"commit message"
)
end
end
it
'updates project activity'
do
expect
(
subject
).
to
receive
(
:update_project_activity
)
subject
.
create_page
(
'Test Page'
,
'This is content'
)
end
end
end
describe
"#update_page"
do
describe
"#update_page"
do
...
@@ -205,6 +211,12 @@ describe ProjectWiki do
...
@@ -205,6 +211,12 @@ describe ProjectWiki do
it
"sets the correct commit message"
do
it
"sets the correct commit message"
do
expect
(
@page
.
version
.
message
).
to
eq
(
"updated page"
)
expect
(
@page
.
version
.
message
).
to
eq
(
"updated page"
)
end
end
it
'updates project activity'
do
expect
(
subject
).
to
receive
(
:update_project_activity
)
subject
.
update_page
(
@gollum_page
,
'Yet more content'
,
:markdown
,
'Updated page again'
)
end
end
end
describe
"#delete_page"
do
describe
"#delete_page"
do
...
@@ -217,6 +229,12 @@ describe ProjectWiki do
...
@@ -217,6 +229,12 @@ describe ProjectWiki do
subject
.
delete_page
(
@page
)
subject
.
delete_page
(
@page
)
expect
(
subject
.
pages
.
count
).
to
eq
(
0
)
expect
(
subject
.
pages
.
count
).
to
eq
(
0
)
end
end
it
'updates project activity'
do
expect
(
subject
).
to
receive
(
:update_project_activity
)
subject
.
delete_page
(
@page
)
end
end
end
private
private
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录