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:
vsizov 2012-01-28 16:42:14 +03:00
commit 6572d96bb5
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/commits/_commits.html.haml
View file

@ -19,6 +19,15 @@
%strong
= truncate(commit.safe_message, :length => 70)
%span.commit-author
Authored by
 
%strong= commit.author_name
= time_ago_in_words(commit.committed_date)
= time_ago_in_words(commit.authored_date)
ago
- if commit.author_name != commit.committer_name or commit.author_email != commit.committer_email or commit.authored_date != commit.committed_date
%span.commit-committer
Committed by
 
%strong= commit.committer_name
= time_ago_in_words(commit.committed_date)
ago

2
app/views/projects/empty.html.haml
View file

@ -1,6 +1,6 @@
- if current_user.require_ssh_key?
%ul.errors_holder
%li You have no ssh keys added yo tour profile.
%li You have no ssh keys added to your profile.
%li You wont be able to pull/push repository.
%li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.