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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5aada8cc
Commit
5aada8cc
authored
Jan 11, 2013
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move wiki delete button to the edit page
parent
e54246d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/views/wikis/edit.html.haml
app/views/wikis/edit.html.haml
+5
-0
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+0
-3
No files found.
app/views/wikis/edit.html.haml
View file @
5aada8cc
%h3
.page_title
Editing page
%h3
.page_title
Editing page
%hr
%hr
=
render
'form'
=
render
'form'
.right
-
if
can?
current_user
,
:admin_wiki
,
@project
=
link_to
project_wiki_path
(
@project
,
@wiki
),
confirm:
"Are you sure you want to delete this page?"
,
method: :delete
,
class:
"btn small danger"
do
Delete this page
\ No newline at end of file
app/views/wikis/show.html.haml
View file @
5aada8cc
...
@@ -16,6 +16,3 @@
...
@@ -16,6 +16,3 @@
=
markdown
@wiki
.
content
=
markdown
@wiki
.
content
%p
.time
Last edited by
#{
@wiki
.
user
.
name
}
,
#{
time_ago_in_words
@wiki
.
created_at
}
ago
%p
.time
Last edited by
#{
@wiki
.
user
.
name
}
,
#{
time_ago_in_words
@wiki
.
created_at
}
ago
-
if
can?
current_user
,
:admin_wiki
,
@project
=
link_to
project_wiki_path
(
@project
,
@wiki
),
confirm:
"Are you sure you want to delete this page?"
,
method: :delete
do
Delete this page
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