summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-27 12:16:34 +0100
committerDouwe Maan <douwe@gitlab.com>2015-04-02 10:57:01 +0200
commitd9698628d9042e820917e1144535888da147c228 (patch)
tree2e503064c3f84c431d690a1cea2cb5a9607238e2
parent403b727138e22ce8ba83332ab03fa21fb7f72a1c (diff)
downloadgitlab-ce-d9698628d9042e820917e1144535888da147c228.tar.gz
Add Commit#author and #committer.
-rw-r--r--app/helpers/commits_helper.rb7
-rw-r--r--app/models/commit.rb8
-rw-r--r--app/services/git_push_service.rb2
3 files changed, 13 insertions, 4 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 5aae697e2f0..d13d80be293 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -134,12 +134,13 @@ module CommitsHelper
# avatar: true will prepend the avatar image
# size: size of the avatar image in px
def commit_person_link(commit, options = {})
+ user = commit.send(options[:source])
+
source_name = clean(commit.send "#{options[:source]}_name".to_sym)
source_email = clean(commit.send "#{options[:source]}_email".to_sym)
- user = User.find_for_commit(source_email, source_name)
- person_name = user.nil? ? source_name : user.name
- person_email = user.nil? ? source_email : user.email
+ person_name = user.try(:name) || source_name
+ person_email = user.try(:email) || source_email
text =
if options[:avatar]
diff --git a/app/models/commit.rb b/app/models/commit.rb
index e0461809e10..481300171be 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -126,6 +126,14 @@ class Commit
"commit #{id}"
end
+ def author
+ User.find_for_commit(author_email, author_name)
+ end
+
+ def committer
+ User.find_for_commit(committer_email, committer_name)
+ end
+
def method_missing(m, *args, &block)
@raw.send(m, *args, &block)
end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 1f0b29dff5e..bb066e39f6b 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -127,6 +127,6 @@ class GitPushService
end
def commit_user(commit)
- User.find_for_commit(commit.author_email, commit.author_name) || user
+ commit.author || user
end
end