Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
ccb0c40c
Commit
ccb0c40c
authored
Nov 15, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ProjectWiki touch Project#last_activity_at after wiki actions
Closes #3026
parent
43d5eca0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+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
No files found.
app/models/project_wiki.rb
View file @
ccb0c40c
...
...
@@ -86,6 +86,8 @@ class ProjectWiki
commit
=
commit_details
(
:created
,
message
,
title
)
wiki
.
write_page
(
title
,
format
,
content
,
commit
)
update_project_activity
rescue
Gollum
::
DuplicatePageError
=>
e
@error_message
=
"Duplicate page:
#{
e
.
message
}
"
return
false
...
...
@@ -95,10 +97,14 @@ class ProjectWiki
commit
=
commit_details
(
:updated
,
message
,
page
.
title
)
wiki
.
update_page
(
page
,
page
.
name
,
format
,
content
,
commit
)
update_project_activity
end
def
delete_page
(
page
,
message
=
nil
)
wiki
.
delete_page
(
page
,
commit_details
(
:deleted
,
message
,
page
.
title
))
update_project_activity
end
def
page_title_and_dir
(
title
)
...
...
@@ -146,4 +152,8 @@ class ProjectWiki
def
path_to_repo
@path_to_repo
||=
File
.
join
(
Gitlab
.
config
.
gitlab_shell
.
repos_path
,
"
#{
path_with_namespace
}
.git"
)
end
def
update_project_activity
@project
.
touch
(
:last_activity_at
)
end
end
spec/models/project_wiki_spec.rb
View file @
ccb0c40c
...
...
@@ -184,6 +184,12 @@ describe ProjectWiki do
subject
.
create_page
(
"test page"
,
"some content"
,
:markdown
,
"commit message"
)
expect
(
subject
.
pages
.
first
.
page
.
version
.
message
).
to
eq
(
"commit message"
)
end
it
'updates project activity'
do
expect
(
subject
).
to
receive
(
:update_project_activity
)
subject
.
create_page
(
'Test Page'
,
'This is content'
)
end
end
describe
"#update_page"
do
...
...
@@ -205,6 +211,12 @@ describe ProjectWiki do
it
"sets the correct commit message"
do
expect
(
@page
.
version
.
message
).
to
eq
(
"updated page"
)
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
describe
"#delete_page"
do
...
...
@@ -217,6 +229,12 @@ describe ProjectWiki do
subject
.
delete_page
(
@page
)
expect
(
subject
.
pages
.
count
).
to
eq
(
0
)
end
it
'updates project activity'
do
expect
(
subject
).
to
receive
(
:update_project_activity
)
subject
.
delete_page
(
@page
)
end
end
private
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment