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
94f04939
Commit
94f04939
authored
Mar 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few fixes afte merge gollum wiki
parent
71ab011a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
app/views/wikis/_nav.html.haml
app/views/wikis/_nav.html.haml
+1
-1
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+0
-12
No files found.
app/views/wikis/_nav.html.haml
View file @
94f04939
%ul
.nav.nav-tabs
-
if
@project
.
wiki_enabled
=
nav_link
(
controller:
'wikis'
)
do
=
link_to
'Wiki'
,
project_wiki_path
(
@project
,
:
index
)
=
link_to
'Wiki'
,
project_wiki_path
(
@project
,
:
home
)
-
if
@project
.
wall_enabled
=
nav_link
(
path:
'projects#wall'
)
do
...
...
app/views/wikis/show.html.haml
View file @
94f04939
...
...
@@ -9,18 +9,6 @@
You can view the
#{
link_to
"most recent version"
,
project_wiki_path
(
@project
,
@wiki
)
}
or browse the
#{
link_to
"history"
,
history_project_wiki_path
(
@project
,
@wiki
)
}
.
.file_holder
.file_title
=
@wiki
.
title
%span
.options
=
link_to
pages_project_wikis_path
(
@project
),
class:
"btn btn-tiny grouped"
do
Pages
-
if
can?
current_user
,
:write_wiki
,
@project
=
link_to
history_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-tiny grouped"
do
History
=
link_to
edit_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-tiny grouped"
do
%i
.icon-edit
Edit
.file_content.wiki
=
preserve
do
=
render_wiki_content
(
@wiki
)
...
...
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