From e2c9770e03681edafe14212d3db1035a675ba47d Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Wed, 15 Jun 2016 11:49:22 -0700
Subject: rm dead `highlighter` method

---
 app/helpers/blob_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 428a42266d0..d639a56f487 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -1,8 +1,4 @@
 module BlobHelper
-  def highlighter(blob_name, blob_content, repository: nil, nowrap: false)
-    Gitlab::Highlight.new(blob_name, blob_content, nowrap: nowrap, repository: repository)
-  end
-
   def highlight(blob_name, blob_content, repository: nil, nowrap: false, plain: false)
     Gitlab::Highlight.highlight(blob_name, blob_content, nowrap: nowrap, plain: plain, repository: repository)
   end
-- 
cgit v1.2.1


From 7214a221e082c569b4804eb4729e097d4e4b069c Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Wed, 15 Jun 2016 11:52:23 -0700
Subject: kill the nowrap option

the <pre><code> wrapping is *always* used by the helper, and *never* by
anywhere else, so pull the wrapping into the helper
---
 app/helpers/blob_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index d639a56f487..39f9f935d31 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -1,6 +1,7 @@
 module BlobHelper
-  def highlight(blob_name, blob_content, repository: nil, nowrap: false, plain: false)
-    Gitlab::Highlight.highlight(blob_name, blob_content, nowrap: nowrap, plain: plain, repository: repository)
+  def highlight(blob_name, blob_content, repository: nil, plain: false)
+    highlighted = Gitlab::Highlight.highlight(blob_name, blob_content, plain: plain, repository: repository)
+    raw %<<pre class="code highlight"><code>#{highlighted}</code></pre>>
   end
 
   def no_highlight_files
-- 
cgit v1.2.1


From c4ea394736f98aebd6b370d75a5b3556206ce09d Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Thu, 14 Jul 2016 22:43:49 -0700
Subject: use %(...) and %[...] in favor of %<...>

---
 app/helpers/blob_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/helpers')

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 39f9f935d31..abe115d8c68 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -1,7 +1,7 @@
 module BlobHelper
   def highlight(blob_name, blob_content, repository: nil, plain: false)
     highlighted = Gitlab::Highlight.highlight(blob_name, blob_content, plain: plain, repository: repository)
-    raw %<<pre class="code highlight"><code>#{highlighted}</code></pre>>
+    raw %(<pre class="code highlight"><code>#{highlighted}</code></pre>)
   end
 
   def no_highlight_files
-- 
cgit v1.2.1