diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-20 09:34:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-20 09:34:54 +0000 |
| commit | 61ebd14d5d8d07e0174f9cc76e3c973b9982050c (patch) | |
| tree | ab6ecb1f13c661566d75babf25840c3250d6bf36 | |
| parent | 0e9d52f33d9c5cfe859da80628b46338a39f1134 (diff) | |
| parent | 865444f1d80b3e8b114b1aa5418984a8264a8bf1 (diff) | |
| download | gitlab-ce-61ebd14d5d8d07e0174f9cc76e3c973b9982050c.tar.gz | |
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
| -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 b82392c4e2b..98461c493df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ 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. @@ -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) |