Merge branch 'gitlab_git-7.1.10' into 'master'
Ignore submodules that are defined in .gitmodules but are checked in as directories. Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26. Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140 See merge request !540
Showing
... | @@ -39,7 +39,7 @@ gem "browser" | ... | @@ -39,7 +39,7 @@ gem "browser" |
# Extracting information from a git repository | # Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | # Provide access to Gitlab::Git library | ||
gem "gitlab_git", '~> 7.1.9' | gem "gitlab_git", '~> 7.1.10' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | # Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' | gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' | ||
... | ... |
想要评论请 注册 或 登录