summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryglukhov <yuriy.glukhov@gmail.com>2015-01-06 10:50:37 +0200
committeryglukhov <yuriy.glukhov@gmail.com>2015-01-13 12:17:05 +0200
commitc13f420b663af3eca6a8c11c7c9c5b3aa684336b (patch)
treeb6faeff3e03b369d7bcc4539b5e7cf3c1227de1c
parent3103e567bce530fdeddf87461cb6a0d112df28d6 (diff)
downloadgitlab-ce-c13f420b663af3eca6a8c11c7c9c5b3aa684336b.tar.gz
First entry in wiki history leads to newest revision.
-rw-r--r--app/helpers/projects_helper.rb5
-rw-r--r--app/views/projects/wikis/history.html.haml5
2 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index e489d431e84..786a386c0ea 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -237,4 +237,9 @@ module ProjectsHelper
result.password = '*****' if result.password.present?
result
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
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index ef4b8f74714..b30eff94f2c 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -12,11 +12,12 @@
%th Last updated
%th Format
%tbody
- - @page.versions.each do |version|
+ - @page.versions.each_with_index do |version, index|
- commit = version
%tr
%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)
%td
= commit.author.name