Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-28 16:49:21 +0300
committerDouwe Maan <douwe@selenight.nl>2016-01-28 16:49:21 +0300
commitb636f83e5910d10a954464370efe42cc14a097ba (patch)
tree25576ef4d66cff8d40cba4004302a178bfc2ec4e /app/controllers/projects/blame_controller.rb
parent4be80f8aa3c585882b4499d6d69dcbf4a97eff29 (diff)
Move blame group logic to dedicated class
Diffstat (limited to 'app/controllers/projects/blame_controller.rb')
-rw-r--r--app/controllers/projects/blame_controller.rb28
1 files changed, 1 insertions, 27 deletions
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index d2aee3879e9..f576d0be1fc 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -8,32 +8,6 @@ class Projects::BlameController < Projects::ApplicationController
def show
@blob = @repository.blob_at(@commit.id, @path)
- @blame = group_blame_lines
- end
-
- def group_blame_lines
- blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
-
- prev_sha = nil
- groups = []
- current_group = nil
-
- highlighted_lines = Gitlab::Highlight.highlight(@blob.name, @blob.data).lines
- i = 0
- blame.each do |commit, line|
- line = highlighted_lines[i].html_safe
- if prev_sha && prev_sha == commit.sha
- current_group[:lines] << line
- else
- groups << current_group if current_group.present?
- current_group = { commit: commit, lines: [line] }
- end
-
- prev_sha = commit.sha
- i += 1
- end
-
- groups << current_group if current_group.present?
- groups
+ @blame_groups = Gitlab::Blame.new(@blob, @commit).groups
end
end