diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-01 11:14:51 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-01 11:14:51 +0000 |
commit | a42f4d8585af3cda1b407c82a4916995b28379fd (patch) | |
tree | 8db66bcf8dd5f90c2f91b5bb2a0f7ee626d79c79 /Gemfile | |
parent | ed7f42fd5c494efcf61655e8b1aff7e9ccbf5377 (diff) | |
parent | ea498c4421b019b53e64ea5688e92e8240046c84 (diff) | |
download | gitlab-ce-a42f4d8585af3cda1b407c82a4916995b28379fd.tar.gz |
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
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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 |