diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 11:17:43 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 11:17:43 +0000 |
| commit | 1490d65e4541f8fdf4fc8257b0621bdd750dd904 (patch) | |
| tree | 2e44f30aa03a5c2ddc04f257b40c8fc60111d178 /app/views | |
| parent | 1f98beba79b16fc0167f8b3396b58d047edade37 (diff) | |
| parent | dbffaaa97e7a195dc5421237392788a03a6b763a (diff) | |
| download | gitlab-ce-1490d65e4541f8fdf4fc8257b0621bdd750dd904.tar.gz | |
Merge branch 'blob-load-all-data' into 'master'
Blob#load_all_data! doesn’t need an argument
See merge request !11977
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/viewers/_text.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |