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

This commit is contained in:
Dmitriy Zaporozhets 2012-03-26 20:30:06 +03:00
commit f1c534c68e
11 changed files with 18 additions and 20 deletions

View file

@ -11,9 +11,7 @@
%td= i + 1
%td
= 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)
ago
)
(#{time_ago_in_words(wiki_page.created_at)}
ago)
%td= wiki_page.user.name