diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-17 12:23:28 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-17 14:38:52 +0300 |
commit | 047dacc7001cc658031914c668111ba42ac9944e (patch) | |
tree | 4c91c5ef5570db47efb7b2687fae60f00330d41a | |
parent | a7be1ad1431d03d13a92b42b7376e6c9072562bd (diff) | |
download | gitlab-ce-047dacc7001cc658031914c668111ba42ac9944e.tar.gz |
Update gitlab_git to ignore invalid lines in .gitmodules.
-rw-r--r-- | CHANGELOG | 11 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index ac175b57916..5de75d368e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,16 @@ 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 + - + - + - + - + - + - + - + v 7.10.0 (unreleased) - Allow users to be invited by email to join a group or project. - Don't crash when project repository doesn't exist. @@ -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) |