fixup! Fix attr reader to force the intended values for source and target shas

285ba1b2 · Douglas Barbosa Alexandre · 849e8e0c · 285ba1b2
Commit 285ba1b2 authored Jul 31, 2016 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

app/models/merge_request.rb app/models/merge_request.rb +2 -6

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -238,15 +238,11 @@ class MergeRequest < ActiveRecord::Base
  end

  def target_branch_sha
-    return @target_branch_sha if defined?(@target_branch_sha)
-
-    target_branch_head.try(:sha)
+    @target_branch_sha || target_branch_head.try(:sha)
  end

  def source_branch_sha
-    return @source_branch_sha if defined?(@source_branch_sha)
-
-    source_branch_head.try(:sha)
+    @source_branch_sha || source_branch_head.try(:sha)
  end

  def diff_refs