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

vsizov
2 parents d6a0b8f4 7d750cbf
Showing 4 changed files with 23 additions and 4 deletions Show diff stats
app/assets/stylesheets/commits.css.scss
app/models/commit.rb
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
@@ -121,8 +121,8 @@ pre.commit_message {
 /** COMMIT BLOCK **/
 .commit-title{display: block;}
 .commit-title{margin-bottom: 10px}
-.commit-author{color: #999; font-weight: normal; font-style: italic;}
-.commit-author strong{font-weight: bold; font-style: normal;}
+.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
+.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
  
 /** bordered list **/
 ul.bordered-list { 
@@ -5,10 +5,12 @@ class Commit
   attr_accessor :refs
  
   delegate :message,
+    :authored_date,
     :committed_date,
     :parents,
     :sha,
     :date,
+    :committer,
     :author,
     :message,
     :diffs,
@@ -37,6 +39,14 @@ class Commit
     author.name
   end
  
+  def committer_name
+    committer.name
+  end
+
+  def committer_email
+    committer.email
+  end
+
   def prev_commit
     parents.first
   end
@@ -19,6 +19,15 @@
               %strong
                 = truncate(commit.safe_message, :length => 70)
             %span.commit-author
+              Authored by
+              &nbsp;
               %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
+                &nbsp;
+                %strong= commit.committer_name
+                = time_ago_in_words(commit.committed_date)
+                ago
 - 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 &rarr; keys and add public key of every machine you want to use for work with gitlabhq.
...	...	@@ -121,8 +121,8 @@ pre.commit_message {
121	121	/ COMMIT BLOCK /
122	122	.commit-title{display: block;}
123	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	127	/ bordered list /
128	128	ul.bordered-list {
...	...
...	...	@@ -5,10 +5,12 @@ class Commit
5	5	attr_accessor :refs
6	6
7	7	delegate :message,
	8	+ :authored_date,
8	9	:committed_date,
9	10	:parents,
10	11	:sha,
11	12	:date,
	13	+ :committer,
12	14	:author,
13	15	:message,
14	16	:diffs,
...	...	@@ -37,6 +39,14 @@ class Commit
37	39	author.name
38	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	50	def prev_commit
41	51	parents.first
42	52	end
...	...
...	...	@@ -19,6 +19,15 @@
19	19	%strong
20	20	= truncate(commit.safe_message, :length => 70)
21	21	%span.commit-author
	22	+ Authored by
	23	+
22	24	%strong= commit.author_name
23		- = time_ago_in_words(commit.committed_date)
	25	+ = time_ago_in_words(commit.authored_date)
24	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
...	...
1	1	- if current_user.require_ssh_key?
2	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	4	%li You wont be able to pull/push repository.
5	5	%li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
6	6
...	...