diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-17 11:37:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-17 11:37:15 +0000 |
| commit | ea939d4691b97acbb87df53cddbdc157b70aae0d (patch) | |
| tree | b62afc87bcacf488bd4185d849b50dcee583f378 | |
| parent | 7266c78b76ab22f873a7907463f0d37642827119 (diff) | |
| parent | 2d913e5a9a7712b579fe1688ffb05bff04844dfc (diff) | |
| download | gitlab-ce-ea939d4691b97acbb87df53cddbdc157b70aae0d.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index e5d8c8d2f16..adcc3b96d11 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) + - Ignore invalid lines in .gitmodules - - - @@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # 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 gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index dc00acf6292..bfe626521e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.6) + gitlab_git (7.1.9) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -703,7 +703,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.1.6) + gitlab_git (~> 7.1.9) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |