Merge branch 'linguist-comment' into 'master'

Explain gitlab forks in Gemfile

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358

See merge request !749

1 files changed, 8 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 35f6b42f879..f5082f626a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,15 +48,23 @@ gem "browser"
 gem "gitlab_git", '~> 7.1.13'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
+# GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
+# For full list of changes see https://github.com/SaitoWu/grack/compare/master...gitlabhq:master
 gem 'gitlab-grack', '~> 2.0.2', require: 'grack'
 
 # LDAP Auth
+# GitLab fork with several improvements to original library. For full list of changes 
+# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
 gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
 
 # Git Wiki
 gem 'gollum-lib', '~> 4.0.2'
 
 # Language detection
+# GitLab fork of linguist does not require pygments/python dependency. 
+# New version of original gem also dropped pygments support but it has strict 
+# dependency to unstable rugged version. We have internal issue for replacing 
+# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052.
 gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
 
 # API