diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-17 23:56:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-17 23:56:02 +0000 |
| commit | 47d55306d95e7ada8b0defa3d266451ce68ca58a (patch) | |
| tree | 284c63bfa0212b881b0f225c921b651022e714fc | |
| parent | 262c6f11fee407350b8945501279a591d35ccb85 (diff) | |
| download | gitlab-ce-47d55306d95e7ada8b0defa3d266451ce68ca58a.tar.gz | |
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules
Closes #2262
| -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 9a6e25ae50a..1683b9ac094 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.0 (unreleased) + - Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules (Stan Hu) - Provide more feedback what went wrong if HipChat service failed test (Stan Hu) - Fix bug where backslashes in inline diffs could be dropped (Stan Hu) - Disable turbolinks when linking to Bitbucket import status (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.12' +gem "gitlab_git", '~> 7.2.14' # 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 c9a7e46409e..f0c661fa9c5 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.12) + gitlab_git (7.2.14) 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.12) + gitlab_git (~> 7.2.14) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |