Merge branch 'fix-discover-branch' into 'master'
Fix Discover Branch Fixes #1073
This commit is contained in:
commit
9ff75e6a6f
2 changed files with 3 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -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'
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue