From dbffaaa97e7a195dc5421237392788a03a6b763a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 6 Jun 2017 16:20:24 -0500
Subject: =?UTF-8?q?Blob#load=5Fall=5Fdata!=20doesn=E2=80=99t=20need=20an?=
 =?UTF-8?q?=20argument?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/blob.rb                    | 4 ++++
 app/models/blob_viewer/server_side.rb | 4 +---
 app/models/repository.rb              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/blob.rb b/app/models/blob.rb
index 6a42a12891c..fd95a1b299b 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -94,6 +94,10 @@ class Blob < SimpleDelegator
     end
   end
 
+  def load_all_data!
+    super(project.repository) if project
+  end
+
   def no_highlighting?
     raw_size && raw_size > MAXIMUM_TEXT_HIGHLIGHT_SIZE
   end
diff --git a/app/models/blob_viewer/server_side.rb b/app/models/blob_viewer/server_side.rb
index 05a3dd7d913..e6bcacf7f70 100644
--- a/app/models/blob_viewer/server_side.rb
+++ b/app/models/blob_viewer/server_side.rb
@@ -9,9 +9,7 @@ module BlobViewer
     end
 
     def prepare!
-      if blob.project
-        blob.load_all_data!(blob.project.repository)
-      end
+      blob.load_all_data!
     end
 
     def render_error
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 07e0b3bae4f..981cb8f2e53 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1102,7 +1102,7 @@ class Repository
     blob = blob_at(sha, path)
     return unless blob
 
-    blob.load_all_data!(self)
+    blob.load_all_data!
     blob.data
   end
 
-- 
cgit v1.2.1