From e20529cec4f6de0c2c1589da99abb8714ea1c1c1 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 10 Sep 2015 13:38:43 -0700
Subject: Bump rouge to 1.10.1

---
 CHANGELOG                               |  2 +-
 Gemfile.lock                            |  4 ++--
 config/initializers/rouge_diff_lexer.rb | 24 ------------------------
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 config/initializers/rouge_diff_lexer.rb

diff --git a/CHANGELOG b/CHANGELOG
index 8cce3a15438..c325d6b6125 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
-  - Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
+  - Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
   - Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
   - Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu)
   - Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu)
diff --git a/Gemfile.lock b/Gemfile.lock
index 647eb17d974..f3091857b7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,7 +291,7 @@ GEM
       github-markup (~> 1.3.1)
       gollum-grit_adapter (~> 0.1, >= 0.1.1)
       nokogiri (~> 1.6.4)
-      rouge (~> 1.10)
+      rouge (~> 1.10.1)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
     gon (5.0.1)
@@ -544,7 +544,7 @@ GEM
       netrc (~> 0.7)
     rinku (1.7.3)
     rotp (1.6.1)
-    rouge (1.10.0)
+    rouge (1.10.1)
     rqrcode (0.4.2)
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
diff --git a/config/initializers/rouge_diff_lexer.rb b/config/initializers/rouge_diff_lexer.rb
deleted file mode 100644
index fdb2d7b748e..00000000000
--- a/config/initializers/rouge_diff_lexer.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Here until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab.
-module Rouge
-  module Lexers
-    class Diff
-      def self.analyze_text(text)
-        return 1   if text.start_with?('Index: ')
-        return 1   if text.start_with?('diff ')
-        return 0.9 if text.start_with?('--- ')
-      end
-
-      state :root do
-        rule(/^ .*\n/, Text)
-        rule(/^---\n/, Text)
-        rule(/^\+.*\n/, Generic::Inserted)
-        rule(/^-+.*\n/, Generic::Deleted)
-        rule(/^!.*\n/, Generic::Strong)
-        rule(/^@.*\n/, Generic::Subheading)
-        rule(/^([Ii]ndex|diff).*\n/, Generic::Heading)
-        rule(/^=.*\n/, Generic::Heading)
-        rule(/.*\n/, Text)
-      end
-    end
-  end
-end
-- 
cgit v1.2.1