Style changes from review with @randx

-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150

2 files changed, 29 insertions, 21 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 28ea8499fc0..703032649b9 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -26,8 +26,8 @@ class MergeRequest < ActiveRecord::Base
 
   include Issuable
 
-  belongs_to :target_project, :foreign_key => :target_project_id, class_name: "Project"
-  belongs_to :source_project, :foreign_key => :source_project_id, class_name: "Project"
+  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
+  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
 
   attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event
 
@@ -149,7 +149,11 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def unmerged_diffs
-    diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
+    if for_fork?
+      diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
+    else
+      diffs = target_project.repository.diffs_between(source_branch, target_branch)
+    end
     diffs ||= []
     diffs
   end
@@ -172,7 +176,7 @@ class MergeRequest < ActiveRecord::Base
 
   def probably_merged?
     unmerged_commits.empty? &&
-        commits.any? && opened?
+      commits.any? && opened?
   end
 
   def reloaded_commits
@@ -185,11 +189,15 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def unmerged_commits
-    commits = Gitlab::Satellite::MergeAction.new(self.author, self).commits_between
+    if for_fork?
+      commits = Gitlab::Satellite::MergeAction.new(self.author, self).commits_between
+    else
+      commits = target_project.repository.commits_between(self.target_branch, self.source_branch)
+    end
     if commits.present?
       commits = Commit.decorate(commits).
-          sort_by(&:created_at).
-          reverse
+      sort_by(&:created_at).
+      reverse
     end
     commits
   end
diff --git a/app/models/note.rb b/app/models/note.rb
index 6b119f00235..fecee950713 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -32,8 +32,8 @@ class Note < ActiveRecord::Base
   delegate :name, :email, to: :author, prefix: true
 
   validates :note, :project, presence: true
-  validates :line_code, format: {with: /\A[a-z0-9]+_\d+_\d+\Z/}, allow_blank: true
-  validates :attachment, file_size: {maximum: 10.megabytes.to_i}
+  validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
+  validates :attachment, file_size: { maximum: 10.megabytes.to_i }
 
   validates :noteable_id, presence: true, if: ->(n) { n.noteable_type.present? && n.noteable_type != 'Commit' }
   validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' }
@@ -42,13 +42,13 @@ class Note < ActiveRecord::Base
 
   # Scopes
   scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
-  scope :inline, -> { where("line_code IS NOT NULL") }
-  scope :not_inline, -> { where(line_code: [nil, '']) }
+  scope :inline, ->{ where("line_code IS NOT NULL") }
+  scope :not_inline, ->{ where(line_code: [nil, '']) }
 
-  scope :common, -> { where(noteable_type: ["", nil]) }
-  scope :fresh, -> { order("created_at ASC, id ASC") }
-  scope :inc_author_project, -> { includes(:project, :author) }
-  scope :inc_author, -> { includes(:author) }
+  scope :common, ->{ where(noteable_type: ["", nil]) }
+  scope :fresh, ->{ order("created_at ASC, id ASC") }
+  scope :inc_author_project, ->{ includes(:project, :author) }
+  scope :inc_author, ->{ includes(:author) }
 
   def self.create_status_change_note(noteable, project, author, status)
     create({
@@ -61,8 +61,8 @@ class Note < ActiveRecord::Base
 
   def commit_author
     @commit_author ||=
-        project.users.find_by_email(noteable.author_email) ||
-            project.users.find_by_name(noteable.author_name)
+      project.users.find_by_email(noteable.author_email) ||
+        project.users.find_by_name(noteable.author_name)
   rescue
     nil
   end
@@ -97,8 +97,8 @@ class Note < ActiveRecord::Base
   # otherwise false is returned
   def downvote?
     votable? && (note.start_with?('-1') ||
-      note.start_with?(':-1:')
-    )
+                 note.start_with?(':-1:')
+                )
   end
 
   def for_commit?
@@ -146,8 +146,8 @@ class Note < ActiveRecord::Base
   # otherwise false is returned
   def upvote?
     votable? && (note.start_with?('+1') ||
-      note.start_with?(':+1:')
-    )
+                 note.start_with?(':+1:')
+                )
   end
 
   def votable?