summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-09 18:21:07 +0200
committerRémy Coutable <remy@rymai.me>2017-06-09 18:21:07 +0200
commitadd493daaceeefe25989344fecbeed4c5c8ee994 (patch)
treeeed7d8025dca266dbae991d6fc0478faadfc38e7
parent320590180703c620cedd6eb6023548dca2d026cf (diff)
downloadgitlab-ce-update-github-linguist-to-5-0-11.tar.gz
Update github-linguist to 5.0.11update-github-linguist-to-5-0-11
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 715ce2bc6c2..a9e7a284aad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ gem 'gollum-lib', '~> 4.2', require: false
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
+gem 'github-linguist', '~> 5.0.11', require: 'linguist'
# API
gem 'grape', '~> 0.19.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d34b84df5e6..792b0750ec1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,11 +277,11 @@ GEM
gitaly (0.8.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
- github-linguist (4.7.6)
+ github-linguist (5.0.11)
charlock_holmes (~> 0.7.3)
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
- rugged (>= 0.23.0b)
+ rugged (>= 0.25.1)
github-markup (1.4.0)
gitlab-flowdock-git-hook (1.0.1)
flowdock (~> 0.7)
@@ -941,7 +941,7 @@ DEPENDENCIES
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
gitaly (~> 0.8.0)
- github-linguist (~> 4.7.0)
+ github-linguist (~> 5.0.11)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)
gitlab_omniauth-ldap (~> 1.2.1)
@@ -1077,4 +1077,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.0
+ 1.15.1