Fix errors.

2 files changed, 8 insertions, 20 deletions

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 7a3c8823e4d..e7c261b7453 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -192,7 +192,7 @@ module Gitlab
         project_path = $LAST_MATCH_INFO[:project]
         if project_path
           actual_project = ::Project.find_with_namespace(project_path)
-          actual_project ||= nil unless can?(user, :read_project, actual_project)
+          actual_project = nil unless can?(user, :read_project, actual_project)
           project_prefix = project_path
         end
 
@@ -235,7 +235,7 @@ module Gitlab
     #
     # Returns string rendered by the processing method
     def reference_link(type, identifier, project = @project, user = current_user, prefix_text = nil)
-      send("reference_#{type}", identifier, project, prefix_text)
+      send("reference_#{type}", identifier, project, user, prefix_text)
     end
 
     def reference_user(identifier, project = @project, user = current_user, _ = nil)
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 719274394f0..2f38c1dcc89 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -7,7 +7,7 @@ module Gitlab
 
     def initialize(project, current_user = nil)
       @project = project
-      @current_user = user
+      @current_user = current_user
 
       @references = Hash.new { [] }
     end
@@ -51,7 +51,7 @@ module Gitlab
 
     def issues
       references[:issues].map do |entry|
-        if should_lookup?(entry[:project])
+        if entry[:project].default_issues_tracker?
           entry[:project].issues.where(iid: entry[:id]).first
         end
       end.compact
@@ -59,9 +59,7 @@ module Gitlab
 
     def merge_requests
       references[:merge_requests].map do |entry|
-        if should_lookup?(entry[:project])
-          entry[:project].merge_requests.where(iid: entry[:id]).first
-        end
+        entry[:project].merge_requests.where(iid: entry[:id]).first
       end.compact
     end
 
@@ -73,17 +71,15 @@ module Gitlab
 
     def commits
       references[:commits].map do |entry|
-        repo = entry[:project].repository if entry[:project]
-        if should_lookup?(entry[:project])
-          repo.commit(entry[:id]) if repo
-        end
+        repo = entry[:project].repository
+        repo.commit(entry[:id]) if repo
       end.compact
     end
 
     def commit_ranges
       references[:commit_ranges].map do |entry|
         repo = entry[:project].repository if entry[:project]
-        if repo && should_lookup?(entry[:project])
+        if repo
           from_id, to_id = entry[:id].split(/\.{2,3}/, 2)
           [repo.commit(from_id), repo.commit(to_id)]
         end
@@ -95,13 +91,5 @@ module Gitlab
     def reference_link(type, identifier, project, user, _)
       references[type] << { project: project, id: identifier }
     end
-
-    def should_lookup?(entry_project)
-      if entry_project.nil?
-        false
-      else
-        project.nil? || entry_project.default_issues_tracker?
-      end
-    end
   end
 end