Fix errors.

This commit is contained in:
Douwe Maan 2015-04-21 17:07:21 +02:00
parent 4dd2f88133
commit 2456695422
2 changed files with 2 additions and 3 deletions

View File

@ -272,7 +272,7 @@ class Note < ActiveRecord::Base
# cross-project references. For same-project references, return the
# unmodified GFM reference.
def mentioner_gfm_ref(noteable, mentioner, mentioner_project = mentioner.project)
if mentioner.is_a?(Commit) && project.nil?
if mentioner.is_a?(Commit) && mentioner_project.nil?
return mentioner.gfm_reference.sub('commit ', 'commit %')
end
@ -283,7 +283,7 @@ class Note < ActiveRecord::Base
# projects are not the same, add the mentioning project's path to the
# returned value.
def full_gfm_reference(mentioning_project, noteable_project, mentioner)
if mentioning_project.id == noteable_project
if mentioning_project == noteable_project
mentioner.gfm_reference
else
if mentioner.is_a?(Commit)

View File

@ -31,7 +31,6 @@ module Gitlab
# For performance purposes maximum 20 latest commits
# will be passed as post receive hook data.
commit_attrs = commits_limited.map(&:hook_attrs)
end
type = Gitlab::Git.tag_ref?(ref) ? "tag_push" : "push"
# Hash to be passed as post_receive_data