Download as
Browse Code »

Commit 6572d96bb5468b9cdf17c34aec83224ad1840369

Authored by vsizov
2 parents d6a0b8f4 7d750cbf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 4 changed files with 23 additions and 4 deletions   Show diff stats
app/assets/stylesheets/commits.css.scss
  Diff comments   View file @6572d96
@@ -121,8 +121,8 @@ pre.commit_message { @@ -121,8 +121,8 @@ pre.commit_message {
121 /** COMMIT BLOCK **/ 121 /** COMMIT BLOCK **/
122 .commit-title{display: block;} 122 .commit-title{display: block;}
123 .commit-title{margin-bottom: 10px} 123 .commit-title{margin-bottom: 10px}
124 -.commit-author{color: #999; font-weight: normal; font-style: italic;}  
125 -.commit-author strong{font-weight: bold; font-style: normal;} 124 +.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
  125 +.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
126 126
127 /** bordered list **/ 127 /** bordered list **/
128 ul.bordered-list { 128 ul.bordered-list {
app/models/commit.rb
  Diff comments   View file @6572d96
@@ -5,10 +5,12 @@ class Commit @@ -5,10 +5,12 @@ class Commit
5 attr_accessor :refs 5 attr_accessor :refs
6 6
7 delegate :message, 7 delegate :message,
  8 + :authored_date,
8 :committed_date, 9 :committed_date,
9 :parents, 10 :parents,
10 :sha, 11 :sha,
11 :date, 12 :date,
  13 + :committer,
12 :author, 14 :author,
13 :message, 15 :message,
14 :diffs, 16 :diffs,
@@ -37,6 +39,14 @@ class Commit @@ -37,6 +39,14 @@ class Commit
37 author.name 39 author.name
38 end 40 end
39 41
  42 + def committer_name
  43 + committer.name
  44 + end
  45 +
  46 + def committer_email
  47 + committer.email
  48 + end
  49 +
40 def prev_commit 50 def prev_commit
41 parents.first 51 parents.first
42 end 52 end
app/views/commits/_commits.html.haml
  Diff comments   View file @6572d96
@@ -19,6 +19,15 @@ @@ -19,6 +19,15 @@
19 %strong 19 %strong
20 = truncate(commit.safe_message, :length => 70) 20 = truncate(commit.safe_message, :length => 70)
21 %span.commit-author 21 %span.commit-author
  22 + Authored by
  23 +  
22 %strong= commit.author_name 24 %strong= commit.author_name
23 - = time_ago_in_words(commit.committed_date) 25 + = time_ago_in_words(commit.authored_date)
24 ago 26 ago
  27 + - if commit.author_name != commit.committer_name or commit.author_email != commit.committer_email or commit.authored_date != commit.committed_date
  28 + %span.commit-committer
  29 + Committed by
  30 +  
  31 + %strong= commit.committer_name
  32 + = time_ago_in_words(commit.committed_date)
  33 + ago
app/views/projects/empty.html.haml
  Diff comments   View file @6572d96
1 - if current_user.require_ssh_key? 1 - if current_user.require_ssh_key?
2 %ul.errors_holder 2 %ul.errors_holder
3 - %li You have no ssh keys added yo tour profile. 3 + %li You have no ssh keys added to your profile.
4 %li You wont be able to pull/push repository. 4 %li You wont be able to pull/push repository.
5 %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq. 5 %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
6 6