diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 09:10:32 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:57 -0600 |
| commit | 5c7f9d69e3db27921acf6d8259245f2b4babcc2b (patch) | |
| tree | b90334ce234ddd3921e0f1780cf3bb0848adff7b /lib/gitlab/conflict/file.rb | |
| parent | 02494f7ce86fbf1276b384f45f58558c427eff63 (diff) | |
| download | gitlab-ce-5c7f9d69e3db27921acf6d8259245f2b4babcc2b.tar.gz | |
Fix code for cops
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index fd43a224b3d..d80bc748209 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -91,11 +91,12 @@ module Gitlab our_highlight = Gitlab::Highlight.highlight(our_path, our_file, repository: repository).lines lines.each do |line| - line.rich_text = if line.type == 'old' - their_highlight[line.old_line - 1].try(:html_safe) - else - our_highlight[line.new_line - 1].try(:html_safe) - end + line.rich_text = + if line.type == 'old' + their_highlight[line.old_line - 1].try(:html_safe) + else + our_highlight[line.new_line - 1].try(:html_safe) + end end end |