diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-17 20:51:12 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-20 12:37:35 +0300 |
commit | 5bbd2b8c4653af03ca0c24e8573cc3817fdf9499 (patch) | |
tree | 6487a8d3d4297b15d6bd6e8a11d678b5c913394a | |
parent | d011527a36a17bba7f93da3575daf0f192fae8e0 (diff) | |
download | gitlab-ce-5bbd2b8c4653af03ca0c24e8573cc3817fdf9499.tar.gz |
Ignore submodules that are defined in .gitmodules but are checked in as directories.
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8810b749080..98461c493df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,8 @@ v 7.11.0 (unreleased) - v 7.10.0 (unreleased) + - Ignore submodules that are defined in .gitmodules but are checked in as directories. + - Allow projects to be imported from Google Code. - Allow users to be invited by email to join a group or project. - Don't crash when project repository doesn't exist. - Add config var to block auto-created LDAP users. @@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # 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 gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index bfe626521e7..360b1abcf56 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.9) + gitlab_git (7.1.10) 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.9) + gitlab_git (~> 7.1.10) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |