diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2014-12-05 13:37:02 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2014-12-05 13:37:02 +0300 |
| commit | f878e1f6b0759c27ab339a21cae19958cafd8813 (patch) | |
| tree | 2c77621c6680ecd8f192ef2cd99256bf1a1a065b | |
| parent | 57d02099d4dbc4fc3a3c78dad3dd5fc6b5d25e9f (diff) | |
| parent | 3ff2ea4c1cbd7175fa45f3c4287d0196429fb2d6 (diff) | |
Merge branch 'release/7.5.3' into '7-5-stable'
Fixes for 7.5.3
See merge request !1302
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index fc21dd0466a..af95b375b16 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,13 @@ -v 7.5.1 - - Add missing timestamps to 'members' table +v 7.5.3 + - Bump gitlab_git to 7.0.0.rc12 (includes Rugged 0.21.2) v 7.5.2 - Don't log Sidekiq arguments by default - Fix restore of wiki repositories from backups +v 7.5.1 + - Add missing timestamps to 'members' table + v 7.5.0 - API: Add support for Hipchat (Kevin Houdebert) - Add time zone configuration on gitlab.yml (Sullivan Senechal) @@ -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.rc11' +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 a3645f7bbec..938ce560620 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.rc11) + 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.2.0) net-ldap (~> 0.9) @@ -447,7 +447,7 @@ GEM ruby-progressbar (1.2.0) rubyntlm (0.4.0) 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.rc11) + gitlab_git (= 7.0.0.rc12) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 3.0.0) |