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
Léo-Paul Géneau
gitlab-ce
Commits
fac22578
Commit
fac22578
authored
May 05, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A bit clearer naming for gollum_wiki.
parent
5a949e60
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
app/models/wiki_page.rb
app/models/wiki_page.rb
+6
-4
No files found.
app/models/wiki_page.rb
View file @
fac22578
...
@@ -175,7 +175,8 @@ class WikiPage
...
@@ -175,7 +175,8 @@ class WikiPage
end
end
def
save
(
method
,
*
args
)
def
save
(
method
,
*
args
)
if
valid?
&&
wiki
.
send
(
method
,
*
args
)
project_wiki
=
wiki
if
valid?
&&
project_wiki
.
send
(
method
,
*
args
)
page_details
=
if
method
==
:update_page
page_details
=
if
method
==
:update_page
@page
.
path
@page
.
path
...
@@ -183,14 +184,15 @@ class WikiPage
...
@@ -183,14 +184,15 @@ class WikiPage
title
title
end
end
page_title
,
page_dir
=
wiki
.
page_title_and_dir
(
page_details
)
page_title
,
page_dir
=
project_wiki
.
page_title_and_dir
(
page_details
)
@page
=
wiki
.
wiki
.
paged
(
page_title
,
page_dir
)
gollum_wiki
=
project_wiki
.
wiki
@page
=
gollum_wiki
.
paged
(
page_title
,
page_dir
)
set_attributes
set_attributes
@persisted
=
true
@persisted
=
true
else
else
errors
.
add
(
:base
,
wiki
.
error_message
)
if
wiki
.
error_message
errors
.
add
(
:base
,
project_wiki
.
error_message
)
if
project_
wiki
.
error_message
@persisted
=
false
@persisted
=
false
end
end
@persisted
@persisted
...
...
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