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
9ce7492e
Commit
9ce7492e
authored
Jan 13, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8540 from yglukhov/wiki-history
First entry in wiki history leads to newest revision.
parents
1f01fcdc
c13f420b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+5
-0
app/views/projects/wikis/history.html.haml
app/views/projects/wikis/history.html.haml
+3
-2
No files found.
app/helpers/projects_helper.rb
View file @
9ce7492e
...
@@ -237,4 +237,9 @@ module ProjectsHelper
...
@@ -237,4 +237,9 @@ module ProjectsHelper
result
.
password
=
'*****'
if
result
.
password
.
present?
result
.
password
=
'*****'
if
result
.
password
.
present?
result
result
end
end
def
project_wiki_path_with_version
(
proj
,
page
,
version
,
is_newest
)
url_params
=
is_newest
?
{}
:
{
version_id:
version
}
project_wiki_path
(
proj
,
page
,
url_params
)
end
end
end
app/views/projects/wikis/history.html.haml
View file @
9ce7492e
...
@@ -12,11 +12,12 @@
...
@@ -12,11 +12,12 @@
%th
Last updated
%th
Last updated
%th
Format
%th
Format
%tbody
%tbody
-
@page
.
versions
.
each
do
|
version
|
-
@page
.
versions
.
each
_with_index
do
|
version
,
index
|
-
commit
=
version
-
commit
=
version
%tr
%tr
%td
%td
=
link_to
project_wiki_path
(
@project
,
@page
,
version_id:
commit
.
id
)
do
=
link_to
project_wiki_path_with_version
(
@project
,
@page
,
commit
.
id
,
index
==
0
)
do
=
truncate_sha
(
commit
.
id
)
=
truncate_sha
(
commit
.
id
)
%td
%td
=
commit
.
author
.
name
=
commit
.
author
.
name
...
...
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