deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-26 20:30:06 +03:00
parent dfe9f3674c fc49b20194
commit f1c534c68e
11 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/wikis/history.html.haml
View file

@ -11,9 +11,7 @@
%td= i + 1 %td= i + 1
%td %td
= link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id) = link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
( (#{time_ago_in_words(wiki_page.created_at)}
= time_ago_in_words(wiki_page.created_at) ago)
ago
)
%td= wiki_page.user.name %td= wiki_page.user.name