diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 21:53:53 +0000 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-09 19:10:29 -0700 |
| commit | 4610c3120f010d75521db4d5ae71b4375a5e9a88 (patch) | |
| tree | 3f48f954ee405f5878661cd6020c2b82feb76cd7 | |
| parent | dbdc1a66d87e794749f86e84a85757a417f8514b (diff) | |
| download | gitlab-ce-4610c3120f010d75521db4d5ae71b4375a5e9a88.tar.gz | |
Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to fix 500 with annotated tags w/o message
Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181
See merge request !1640
Conflicts:
Gemfile
Gemfile.lock
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -38,7 +38,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc14' +gem "gitlab_git", '7.0.1' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 3283da40f8d..0e26a13a8f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc14) + gitlab_git (7.0.1) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -674,7 +674,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc14) + gitlab_git (= 7.0.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 4.0.0) |