diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-08 22:46:07 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-08 22:46:07 +0300 |
| commit | c1d9ba479c82ab9249b0e88f24b269067ad01980 (patch) | |
| tree | 484f5162eacb940afdd90066b4708f13bb88132b | |
| parent | f092e53ee943aaf19b5febfca3ba8d3860ae1700 (diff) | |
| parent | 9b15ec417215a35e46acc0802e46b807136298bf (diff) | |
Merge branch '7-3-gitlab-git-update' into '7-3-stable'
Bump gitlab_git version to 6.2.2 for 7.3
We need to bump the gitlab_git version for 7-3-stable to 6.2.2 so that it includes the 0.21.2 version of rugged.
QA Tests have been performed to warrant compatibility.
/cc @jacobvosmaer @job
See merge request !1377
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index f2065c529c1..4d54c99d0b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 7.3.3 + - Bump gitlab_git to 6.2.2 (includes Rugged 0.21.2) + v 7.3.2 - Fix creating new file via web editor - Use gitlab-shell v2.0.1 @@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 6.0' +gem "gitlab_git", '~> 6.2.2' # 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 e9be030a8fa..61f2dad70d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,12 +179,12 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (6.2.1) + gitlab_git (6.2.2) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-grit (~> 2.6) gitlab-linguist (~> 3.0) - rugged (~> 0.21.0) + rugged (~> 0.21.2) gitlab_meta (7.0) gitlab_omniauth-ldap (1.1.0) net-ldap (~> 0.7.0) @@ -440,7 +440,7 @@ GEM ruby-progressbar (1.2.0) rubyntlm (0.1.1) rubypants (0.2.0) - rugged (0.21.0) + rugged (0.21.2) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -617,7 +617,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (~> 6.0) + gitlab_git (~> 6.2.2) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |