From f1f9b5f7d388c6d7a0938229c9211beddb2fd6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Tue, 12 Jan 2016 12:53:54 -0500
Subject: [PATCH] Small fixes from code review. #3945

---
 app/controllers/projects/merge_requests_controller.rb | 2 +-
 app/helpers/blob_helper.rb                            | 6 +++---
 lib/gitlab/diff/highlight.rb                          | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d25adbe952d..b70533ef7be 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -104,7 +104,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @commit = @merge_request.last_commit
     @first_commit = @merge_request.first_commit
     @diffs = @merge_request.compare_diffs
-    @diff_refs = [@merge_request.target_sha, @merge_request.source_branch]
+    @diff_refs = [@merge_request.target_sha, @merge_request.source_sha]
 
     @ci_commit = @merge_request.ci_commit
     @statuses = @ci_commit.statuses if @ci_commit
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 1230002e69c..a80162a3e33 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -11,14 +11,14 @@ module BlobHelper
   end
 
   def highlight(blob_name, blob_content, nowrap: false, continue: false)
-    @formatter ||= rouge_formatter(nowrap: nowrap)
+    formatter = rouge_formatter(nowrap: nowrap)
 
     begin
       @lexer ||= Rouge::Lexer.guess(filename: blob_name, source: blob_content).new
-      result = @formatter.format(@lexer.lex(blob_content, continue: continue)).html_safe
+      result = formatter.format(@lexer.lex(blob_content, continue: continue)).html_safe
     rescue
       @lexer = Rouge::Lexers::PlainText
-      result = @formatter.format(@lexer.lex(blob_content)).html_safe
+      result = formatter.format(@lexer.lex(blob_content)).html_safe
     end
 
     result
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index 3c44abff3fb..d0137ab5f08 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -125,10 +125,6 @@ module Gitlab
           lines.map! { |line| " #{line}" }
         end
       end
-
-      def submodules
-        @submodules ||= diff_repository.raw_repository.submodules(diff_new_ref).keys
-      end
     end
   end
 end