diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-07 02:33:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-07 02:33:44 +0300 |
| commit | da0e499412a29e590cc0f419a91d89c47020511a (patch) | |
| tree | 853622e4f36aeb0730ac54edefe045094a138f6e | |
| parent | 04dd8452408cec176c5e849595bc63f0129c9dd6 (diff) | |
| parent | 536a75209013bdcc11eca400718483ae10e36328 (diff) | |
Merge branch '7-4-gitlab-git-update' into '7-4-stable'
Bump gitlab_git version to 7.0.0.rc12 for 7.4
We need to bump the gitlab_git version for 7-4-stable to 7.0.0.rc12 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 !1371
| -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 f539d2e272b..ffddd5b37c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 7.4.5 + - Bump gitlab_git to 7.0.0.rc12 (includes Rugged 0.21.2) + v 7.4.3 - Fix raw snippets view - Fix security issue for member api @@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc10' +gem "gitlab_git", '7.0.0.rc12' # 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 f4ecbe6dedc..24e38785dc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,11 +179,11 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc10) + gitlab_git (7.0.0.rc12) activesupport (~> 4.0) charlock_holmes (~> 0.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) @@ -447,7 +447,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) @@ -625,7 +625,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc10) + gitlab_git (= 7.0.0.rc12) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |