diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-06 16:20:24 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-07 14:28:33 -0500 |
| commit | dbffaaa97e7a195dc5421237392788a03a6b763a (patch) | |
| tree | 50bb684af42b12ee18b8221573827bdbc2d18504 /app | |
| parent | fc1090d9f39231e31f929e37b9703db9738b457c (diff) | |
| download | gitlab-ce-blob-load-all-data.tar.gz | |
Blob#load_all_data! doesn’t need an argumentblob-load-all-data
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 6 | ||||
| -rw-r--r-- | app/models/blob.rb | 4 | ||||
| -rw-r--r-- | app/models/blob_viewer/server_side.rb | 4 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/viewers/_text.html.haml | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7025c7a1de6..4f53929a308 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/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 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 diff --git a/app/views/projects/diffs/viewers/_text.html.haml b/app/views/projects/diffs/viewers/_text.html.haml index e4b89671724..120d3540223 100644 --- a/app/views/projects/diffs/viewers/_text.html.haml +++ b/app/views/projects/diffs/viewers/_text.html.haml @@ -1,5 +1,5 @@ - 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 |