diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-18 15:29:52 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-18 15:29:52 +0000 |
| commit | 1f14495124e38a0682476744b95a8299ad06593a (patch) | |
| tree | db8d9a230e168f9bc70dd4bbc543f9df34edaf57 | |
| parent | 75a90b6eefa04344dbf962247845811d9f32c7fd (diff) | |
| parent | d81a2836dfa75142c7d05dfecc14f6ccf3d78044 (diff) | |
| download | gitlab-ce-1f14495124e38a0682476744b95a8299ad06593a.tar.gz | |
Merge branch 'fix/update-gitlab-git' into 'master'
Update gitlab_git gem to 10.4.7
See merge request !5851
| -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 61c654002ad..e6c96b7a6e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -130,6 +130,7 @@ v 8.11.0 (unreleased) - Speed up todos queries by limiting the projects set we join with - Ensure file editing in UI does not overwrite commited changes without warning user - Eliminate unneeded calls to Repository#blob_at when listing commits with no path + - Update gitlab_git gem to 10.4.7 v 8.10.6 - Upgrade Rails to 4.2.7.1 for security fixes. !5781 @@ -53,7 +53,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.4.5' +gem 'gitlab_git', '~> 10.4.7' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 58c84c47575..accb5cea73b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.4.5) + gitlab_git (10.4.7) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -857,7 +857,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.4.5) + gitlab_git (~> 10.4.7) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) |