diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-27 13:07:14 -0700 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-05 17:57:39 -0400 |
| commit | 348b983a534469654b0c7dd58ec1d9b8e9203ed1 (patch) | |
| tree | 330358fc45f9a6aa694fb4213f7f03c85879871a | |
| parent | cdee3ab97dd205e1ec1bc9097828e186830cee79 (diff) | |
| download | gitlab-ce-348b983a534469654b0c7dd58ec1d9b8e9203ed1.tar.gz | |
Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
| -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 3e067054cf5..0f4928e8521 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.14.2 + - Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files (Stan Hu) v 7.14.1 - Only include base URL in OmniAuth full_host parameter (Stan Hu) @@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.14' +gem "gitlab_git", '~> 7.2.15' # Ruby/Rack Git Smart-HTTP Server Handler # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc) diff --git a/Gemfile.lock b/Gemfile.lock index f0c661fa9c5..d09d1f9dc66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.2.14) + gitlab_git (7.2.15) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -787,7 +787,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.14) + gitlab_git (~> 7.2.15) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |