Merge branch 'blob-load-all-data' into 'master'

Blob#load_all_data! doesn’t need an argument

See merge request !11977

app/controllers/projects/blob_controller.rb

@@ -55,7 +55,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def edit
     if can_collaborate_with_project?
-      blob.load_all_data!(@repository)
+      blob.load_all_data!
     else
       redirect_to action: 'show'
     end
@@ -74,7 +74,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def preview
     @content = params[:content]
-    @blob.load_all_data!(@repository)
+    @blob.load_all_data!
     diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3', include_diff_info: true)
     diff_lines = diffy.diff.scan(/.*\n/)[2..-1]
     diff_lines = Gitlab::Diff::Parser.new.parse(diff_lines)
@@ -111,7 +111,7 @@ class Projects::BlobController < Projects::ApplicationController
   private
 
   def blob
-    @blob ||= Blob.decorate(@repository.blob_at(@commit.id, @path), @project)
+    @blob ||= @repository.blob_at(@commit.id, @path)
 
     if @blob
       @blob

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

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

app/models/repository.rb

@@ -1104,7 +1104,7 @@ class Repository
     blob = blob_at(sha, path)
     return unless blob
 
-    blob.load_all_data!(self)
+    blob.load_all_data!
     blob.data
   end
 

app/views/projects/diffs/viewers/_text.html.haml

 - blob = diff_file.blob
-- blob.load_all_data!(diff_file.repository)
+- blob.load_all_data!
 - total_lines = blob.lines.size
 - total_lines -= 1 if total_lines > 0 && blob.lines.last.blank?
 - if diff_view == :parallel

lib/api/files.rb

@@ -25,7 +25,7 @@ module API
         @blob = @repo.blob_at(@commit.sha, params[:file_path])
 
         not_found!('File') unless @blob
-        @blob.load_all_data!(@repo)
+        @blob.load_all_data!
       end
 
       def commit_response(attrs)

lib/api/v3/files.rb

@@ -56,7 +56,7 @@ module API
           blob = repo.blob_at(commit.sha, params[:file_path])
           not_found!('File') unless blob
 
-          blob.load_all_data!(repo)
+          blob.load_all_data!
           status(200)
 
           {

lib/gitlab/blame.rb

@@ -40,7 +40,7 @@ module Gitlab
     end
 
     def highlighted_lines
-      @blob.load_all_data!(repository)
+      @blob.load_all_data!
       @highlighted_lines ||=
         Gitlab::Highlight.highlight(@blob.path, @blob.data, repository: repository).lines
     end

lib/gitlab/highlight.rb

@@ -9,7 +9,7 @@ module Gitlab
       blob = repository.blob_at(ref, file_name)
       return [] unless blob
 
-      blob.load_all_data!(repository)
+      blob.load_all_data!
       highlight(file_name, blob.data, repository: repository).lines.map!(&:html_safe)
     end
 

spec/requests/git_http_spec.rb

@@ -648,7 +648,7 @@ describe 'Git HTTP requests', lib: true do
             # Provide a dummy file in its place
             allow_any_instance_of(Repository).to receive(:blob_at).and_call_original
             allow_any_instance_of(Repository).to receive(:blob_at).with('b83d6e391c22777fca1ed3012fce84f633d7fed0', 'info/refs') do
-              Gitlab::Git::Blob.find(project.repository, 'master', 'bar/branch-test.txt')
+              Blob.decorate(Gitlab::Git::Blob.find(project.repository, 'master', 'bar/branch-test.txt'), project)
             end
 
             get "/#{project.path_with_namespace}/blob/master/info/refs"