diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-06 16:18:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-06 16:18:52 +0000 |
| commit | 9ff75e6a6f7ada371fb1c0905a6e5b24d41504e4 (patch) | |
| tree | a6816445fe10a639b034e3b33640e3fdfd9f97cd | |
| parent | 694388dfbc75c6d6f2b51fc2acf0b15c7d8eda2a (diff) | |
| parent | 0776199b4a693b7465ce7e50d4f21b4addc4941e (diff) | |
| download | gitlab-ce-9ff75e6a6f7ada371fb1c0905a6e5b24d41504e4.tar.gz | |
Merge branch 'fix-discover-branch' into 'master'
Fix Discover Branch
Fixes #1073
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -32,7 +32,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 5.7.0' +gem "gitlab_git", '~> 5.7.1' # 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 0cffe1ab3fc..70cb8b9ec4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_git (5.7.0) + gitlab_git (5.7.1) activesupport (~> 4.0.0) charlock_holmes (~> 0.6.9) gitlab-grit (~> 2.6.1) @@ -590,7 +590,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.1.0) gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) - gitlab_git (~> 5.7.0) + gitlab_git (~> 5.7.1) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.4) gon (~> 5.0.0) |