diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-06 20:02:19 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-06 20:02:19 +0300 |
| commit | 0cbc6d11e8875672fc5bc4b98b12866c79e1a3be (patch) | |
| tree | 9f6328359158ec4ea6f1f87ae39de9f56cea29d9 | |
| parent | e8c2c624c3eb394c45c431cf8e3c107231f2b8b5 (diff) | |
| parent | 05d60e31d88f928e113a1a254cc1bc7f587c7528 (diff) | |
Merge branch '7-2-gitlab-git-update' into '7-2-stable'
Bump gitlab_git version to 6.2.2
We need to bump the `gitlab_git` version for 7-2-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 !1366
| -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 bc2d34d49fa..9d4a7b2ea7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 7.2.2 + - Bump gitlab_git to 6.2.2 (includes Rugged 0.21.2) + v 7.2.1 - Delete orphaned labels during label migration (James Brooks) - Security: prevent XSS with stricter MIME types for raw repo files @@ -30,7 +30,7 @@ gem 'omniauth-github' # 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 205599e898c..76755faa14d 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.0.4) net-ldap (~> 0.3.1) @@ -436,7 +436,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) @@ -613,7 +613,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.0.4) gollum-lib (~> 3.0.0) |