Commit 24566954 authored by Douwe Maan's avatar Douwe Maan

Fix errors.

parent 4dd2f881
...@@ -272,7 +272,7 @@ class Note < ActiveRecord::Base ...@@ -272,7 +272,7 @@ class Note < ActiveRecord::Base
# cross-project references. For same-project references, return the # cross-project references. For same-project references, return the
# unmodified GFM reference. # unmodified GFM reference.
def mentioner_gfm_ref(noteable, mentioner, mentioner_project = mentioner.project) 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 %') return mentioner.gfm_reference.sub('commit ', 'commit %')
end end
...@@ -283,7 +283,7 @@ class Note < ActiveRecord::Base ...@@ -283,7 +283,7 @@ class Note < ActiveRecord::Base
# projects are not the same, add the mentioning project's path to the # projects are not the same, add the mentioning project's path to the
# returned value. # returned value.
def full_gfm_reference(mentioning_project, noteable_project, mentioner) def full_gfm_reference(mentioning_project, noteable_project, mentioner)
if mentioning_project.id == noteable_project if mentioning_project == noteable_project
mentioner.gfm_reference mentioner.gfm_reference
else else
if mentioner.is_a?(Commit) if mentioner.is_a?(Commit)
......
...@@ -31,7 +31,6 @@ module Gitlab ...@@ -31,7 +31,6 @@ module Gitlab
# For performance purposes maximum 20 latest commits # For performance purposes maximum 20 latest commits
# will be passed as post receive hook data. # will be passed as post receive hook data.
commit_attrs = commits_limited.map(&:hook_attrs) commit_attrs = commits_limited.map(&:hook_attrs)
end
type = Gitlab::Git.tag_ref?(ref) ? "tag_push" : "push" type = Gitlab::Git.tag_ref?(ref) ? "tag_push" : "push"
# Hash to be passed as post_receive_data # Hash to be passed as post_receive_data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment