Commit f21ac8f5 authored by Job van der Voort's avatar Job van der Voort

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
parents 43d11880 30b2a95b
......@@ -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)}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment