diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-23 20:50:15 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-23 20:50:15 +0000 |
| commit | 1e96e7f6d2d77f7a6f18c4f1716e8dec62ac6c19 (patch) | |
| tree | 7e4ae6f14c5dd75cae89c2d75237a286fce88ef5 | |
| parent | b7c7ebee598b038e33afb898a8e2f0987d2f566d (diff) | |
| parent | 2237c8883f87a130150ee34c88336db8656967b9 (diff) | |
| download | gitlab-ce-1e96e7f6d2d77f7a6f18c4f1716e8dec62ac6c19.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 4f98d0a6915..fcfd0a21be3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.9.1 - Fix merge requests project settings help link anchor - Fix GitLab project import issues related to notes and builds - Improve performance of searching repository tags by name by using a memorized tag array + - Fix false truncated warnings with ISO-8559 files - Fix 404 when accessing pipelines as guest user on public projects v 8.9.0 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) |