diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-23 20:50:15 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-23 18:22:02 -0400 |
| commit | a23e108ea604426d6c0b430cd7378647fb5fa0a4 (patch) | |
| tree | 940da9e9b883d7ccb3a5317c16dbf43aeffcb5e5 | |
| parent | 25670ee440a4707c407fcd4bbf1dc3cf6bd1f00e (diff) | |
| download | gitlab-ce-a23e108ea604426d6c0b430cd7378647fb5fa0a4.tar.gz | |
Merge branch 'bump-gitlab-git-10-2-1' into 'master'
Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files
Closes #18690
See merge request !4884
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 21c75953039..3c47a1289cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.9.1 (unreleased) - Restore old behavior around diff notes to outdated discussions. !4870 - Fix merge requests project settings help link anchor. !4873 - Fix 404 when accessing pipelines as guest user on public projects. !4881 + - Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files. !4884 v 8.9.0 - Fix builds API response not including commit data diff --git a/Gemfile.lock b/Gemfile.lock index ba16e4bf337..ce52985bd4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,7 +277,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.2.0) + gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) |