Merge branch 'timestamp-wikis' into 'master'

Added a timestamp to the wikis page just below the title Now it looks like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png) See merge request !1055

Merge branch 'timestamp-wikis' into 'master'
f21ac8f5 · Job van der Voort · 43d11880 · 30b2a95b · f21ac8f5
Commit f21ac8f5 authored Jul 28, 2015 by Job van der Voort
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

show.html.haml app/views/projects/wikis/show.html.haml +5 -1

No files found.
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -3,6 +3,10 @@
 %h3.page-title
  = @page.title
  = render 'main_links'
+
+.wiki-last-edit-by
+  Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
+
 - if @page.historical?
  .warning_message
    This is an old version of this page.
@@ -16,6 +20,6 @@
      = render_wiki_content(@page)

 %hr
-
 .wiki-last-edit-by
  Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
+