diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-20 18:24:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-20 18:24:58 +0000 |
| commit | 2d8b6901baf425e59b47919283c4805fde3c9e1b (patch) | |
| tree | f64bc1efabac1ecb45e5e75966cacb9cb5a1f126 | |
| parent | 7c01a91bb701d74cdaadcb85d8af9b6e13067a20 (diff) | |
| parent | 419a5e00eb83d3ae1fb9725200bb4a72cb8a52e2 (diff) | |
| download | gitlab-ce-2d8b6901baf425e59b47919283c4805fde3c9e1b.tar.gz | |
Merge branch 'update-gitlab_git' into 'master'
Upgraded gitlab_git to fix issue #5858
This updates the dependency on gitlab_git and fixes #5858 - reproduced locally and issue disappears with the change.
Related MR that actually adds branch name support to commits_between: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/61
See merge request !2516
| -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 2e0eee52a59..03fce7e2157 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.5.0 (unreleased) - Add "visibility" flag to GET /projects api endpoint + - Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push v 8.4.0 (unreleased) - Allow LDAP users to change their email if it was not set by the LDAP server @@ -49,7 +49,7 @@ gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.22' +gem "gitlab_git", '~> 7.2.23' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index a14fdbeed23..acd7978c345 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,7 +356,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.2.0) gemojione (~> 2.1) - gitlab_git (7.2.22) + gitlab_git (7.2.23) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -932,7 +932,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_emoji (~> 0.2.0) - gitlab_git (~> 7.2.22) + gitlab_git (~> 7.2.23) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) |