From ddc44b908b31238a0164331dd8cd5be82eb32bd3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 25 Nov 2013 16:53:44 +0200
Subject: [PATCH] Update gitlab-linguist version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
Gemfile | 2 +-
Gemfile.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index 948bbafeb4000..c35b848ee0ce9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
# Language detection
-gem "gitlab-linguist", "~> 2.9.5", require: "linguist"
+gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
# API
gem "grape", "~> 0.4.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 033b147a9ba3e..b45fb12398941 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,7 +116,7 @@ GEM
enumerize (0.6.1)
activesupport (>= 3.2)
erubis (2.7.0)
- escape_utils (0.3.2)
+ escape_utils (0.2.4)
eventmachine (1.0.3)
excon (0.13.4)
execjs (1.4.0)
@@ -171,9 +171,9 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
- gitlab-linguist (2.9.5)
+ gitlab-linguist (2.9.6)
charlock_holmes (~> 0.6.6)
- escape_utils (~> 0.3.1)
+ escape_utils (~> 0.2.4)
gitlab-pygments.rb (~> 0.5.4)
mime-types (~> 1.19)
gitlab-pygments.rb (0.5.4)
@@ -577,7 +577,7 @@ DEPENDENCIES
gitlab-flowdock-git-hook (~> 0.4.2)
gitlab-gollum-lib (~> 1.0.2)
gitlab-grack (~> 1.0.1)
- gitlab-linguist (~> 2.9.5)
+ gitlab-linguist (~> 2.9.6)
gitlab-pygments.rb (~> 0.5.4)
gitlab_git (~> 3.1.0)
gitlab_meta (= 6.0)
--
GitLab