summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-04-21 01:48:03 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-04-21 01:48:03 +0300
commit8d02d8c0456aa3307ed9074ac1944df7b2c19eb2 (patch)
tree5e4db759d245be79a9788e21c56673b8fe732eee
parent7c8fbe8f7f8d94f92ddb1a4a32cf72867ab21ba7 (diff)
downloadgitlab-ce-8d02d8c0456aa3307ed9074ac1944df7b2c19eb2.tar.gz
linguist gitlab fork
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock20
2 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index f103d21d678..3f5a1838ca3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "six"
gem "therubyracer"
gem "faker"
gem "seed-fu"
-gem "linguist", "~> 1.0.0", :git => "https://github.com/github/linguist.git"
+gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "pygments.rb", "0.2.11"
gem "redcarpet", "~> 2.1.1"
gem "thin"
diff --git a/Gemfile.lock b/Gemfile.lock
index 12d0ddd609f..81d6236ae6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,16 +5,6 @@ GIT
annotate (2.4.1.beta1)
GIT
- remote: https://github.com/github/linguist.git
- revision: c444c25b27131cd2aca6017f2a9ce5eae60dfcd3
- specs:
- linguist (1.0.0)
- charlock_holmes (~> 0.6.6)
- escape_utils (~> 0.2.3)
- mime-types (~> 1.18)
- pygments.rb (~> 0.2.11)
-
-GIT
remote: https://github.com/gitlabhq/gitolite-client.git
revision: 36dabd226caa40ff052677719adaacbfe667b36c
specs:
@@ -32,6 +22,16 @@ GIT
posix-spawn (~> 0.3.6)
GIT
+ remote: https://github.com/gitlabhq/linguist.git
+ revision: c3d6fc5af8cf9d67afa572bba363bf0db256a900
+ specs:
+ linguist (1.0.0)
+ charlock_holmes (~> 0.6.6)
+ escape_utils (~> 0.2.3)
+ mime-types (~> 1.18)
+ pygments.rb (~> 0.2.11)
+
+GIT
remote: https://github.com/gitlabhq/yaml_db.git
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
specs: