Merge branch 'fix-tags-view-with-submodules' into 'master'

Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens. Closes https://github.com/gitlabhq/gitlabhq/issues/8411 See merge request !607

Merge branch 'fix-tags-view-with-submodules' into 'master'
8e4dcbb8 · Douwe Maan · f84e78f3 · e27bc577 · 8e4dcbb8 · 8e4dcbb8
Commit 8e4dcbb8 authored May 12, 2015 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 7.11.0 (unreleased)
  - Don't show duplicate deploy keys
  - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger)
  - Make the first branch pushed to an empty repository the default HEAD (Stan Hu)
+  - 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".

--- a/Gemfile
+++ b/Gemfile
@@ -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'

--- 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)