diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-09-30 08:57:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-09-30 08:57:37 +0000 |
| commit | c20c2c83859bf7ba699c085a1baf0ee1f1a6da7a (patch) | |
| tree | ac769cc4cd8029194d50ddd6f5440d73beb3b12a | |
| parent | 3f739428a0007ec9116ac60e6ed501c1cad6cb63 (diff) | |
| parent | 5601b87b3113e3e072c4f7b0fc159816ccb05fb7 (diff) | |
| download | gitlab-ce-c20c2c83859bf7ba699c085a1baf0ee1f1a6da7a.tar.gz | |
Merge branch 'fix-network-graph' into 'master'
Fix network graph
Fix #1624
See merge request !1135
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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.rc5' +gem "gitlab_git", '7.0.0.rc6' # 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 6777625ae87..da3016231b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc5) + gitlab_git (7.0.0.rc6) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -618,7 +618,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc5) + gitlab_git (= 7.0.0.rc6) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |