diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-04 07:39:59 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-04 10:37:44 -0700 |
| commit | e27bc577af8d9e8f3bbf4d41c8d7835c417bfb51 (patch) | |
| tree | 82145c2d0618ce31390d932a18f0b1980c156154 | |
| parent | 16db51ec588bad1f341ffd3be9153cc453fce0f1 (diff) | |
| download | gitlab-ce-e27bc577af8d9e8f3bbf4d41c8d7835c417bfb51.tar.gz | |
Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with submodules would return a 500 error
Closes https://github.com/gitlabhq/gitlabhq/issues/8411
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 72ae0b4f24d..06310a3174e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) + - Fix broken view when using a tag to display a tree that contains git submodules (Stan Hu) - Make Reply-To config apply to change e-mail confirmation and other Devise notifications (Stan Hu) - Add application setting to restrict user signups to e-mail domains (Stan Hu) - Don't allow a merge request to be merged when its title starts with "WIP". @@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.1.10' +gem "gitlab_git", '~> 7.1.11' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.2', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 676a5197900..5c613fdb555 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.10) + gitlab_git (7.1.11) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) |