diff options
| author | Job van der Voort <job@gitlab.com> | 2015-07-28 13:47:25 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-07-28 13:47:25 +0000 |
| commit | f21ac8f5c6899c4e72afa9613478134bcc22aa6a (patch) | |
| tree | b898cc8245a7ae07b3e0b738223db079f838d4fe /app/views | |
| parent | 43d118803133558209973464b1c16fd4c7ba446c (diff) | |
| parent | 30b2a95b4d7d51f7c14c07c9f57fa84c1148725f (diff) | |
| download | gitlab-ce-f21ac8f5c6899c4e72afa9613478134bcc22aa6a.tar.gz | |
Merge branch 'timestamp-wikis' into 'master'
Added a timestamp to the wikis page just below the title
Now it looks like this:
See merge request !1055
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index 83cd4c66672..5c4dd7f91ae 100644 --- 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)} + |