Merge branch 'gitlab_git-7.1.9' into 'master'
Update gitlab_git to ignore invalid lines in .gitmodules. Pulls in gitlab_git 7.1.9 which contains https://gitlab.com/gitlab-org/gitlab_git/merge_requests/24 Closes #1412, https://github.com/gitlabhq/gitlabhq/issues/8135 and https://github.com/gitlabhq/gitlabhq/issues/8881 See merge request !535
This commit is contained in:
commit
ea939d4691
|
@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 7.11.0 (unreleased)
|
v 7.11.0 (unreleased)
|
||||||
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
|
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
|
||||||
|
- Ignore invalid lines in .gitmodules
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -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.6'
|
gem "gitlab_git", '~> 7.1.9'
|
||||||
|
|
||||||
# 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'
|
||||||
|
|
|
@ -212,7 +212,7 @@ GEM
|
||||||
mime-types (~> 1.19)
|
mime-types (~> 1.19)
|
||||||
gitlab_emoji (0.1.0)
|
gitlab_emoji (0.1.0)
|
||||||
gemojione (~> 2.0)
|
gemojione (~> 2.0)
|
||||||
gitlab_git (7.1.6)
|
gitlab_git (7.1.9)
|
||||||
activesupport (~> 4.0)
|
activesupport (~> 4.0)
|
||||||
charlock_holmes (~> 0.6)
|
charlock_holmes (~> 0.6)
|
||||||
gitlab-linguist (~> 3.0)
|
gitlab-linguist (~> 3.0)
|
||||||
|
@ -703,7 +703,7 @@ DEPENDENCIES
|
||||||
gitlab-grack (~> 2.0.0.rc2)
|
gitlab-grack (~> 2.0.0.rc2)
|
||||||
gitlab-linguist (~> 3.0.1)
|
gitlab-linguist (~> 3.0.1)
|
||||||
gitlab_emoji (~> 0.1)
|
gitlab_emoji (~> 0.1)
|
||||||
gitlab_git (~> 7.1.6)
|
gitlab_git (~> 7.1.9)
|
||||||
gitlab_meta (= 7.0)
|
gitlab_meta (= 7.0)
|
||||||
gitlab_omniauth-ldap (= 1.2.1)
|
gitlab_omniauth-ldap (= 1.2.1)
|
||||||
gollum-lib (~> 4.0.2)
|
gollum-lib (~> 4.0.2)
|
||||||
|
|
Loading…
Reference in New Issue