Download as
Browse Code »

Commit 9ff75e6a6f7ada371fb1c0905a6e5b24d41504e4

Authored by Dmitriy Zaporozhets
2 parents 694388df 0776199b
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'fix-discover-branch' into 'master' 

Fix Discover Branch

Fixes #1073
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
@@ -32,7 +32,7 @@ gem 'omniauth-github' @@ -32,7 +32,7 @@ gem 'omniauth-github'
32 32
33 # Extracting information from a git repository 33 # Extracting information from a git repository
34 # Provide access to Gitlab::Git library 34 # Provide access to Gitlab::Git library
35 -gem "gitlab_git", '~> 5.7.0' 35 +gem "gitlab_git", '~> 5.7.1'
36 36
37 # Ruby/Rack Git Smart-HTTP Server Handler 37 # Ruby/Rack Git Smart-HTTP Server Handler
38 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' 38 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
@@ -181,7 +181,7 @@ GEM @@ -181,7 +181,7 @@ GEM
181 charlock_holmes (~> 0.6.6) 181 charlock_holmes (~> 0.6.6)
182 escape_utils (~> 0.2.4) 182 escape_utils (~> 0.2.4)
183 mime-types (~> 1.19) 183 mime-types (~> 1.19)
184 - gitlab_git (5.7.0) 184 + gitlab_git (5.7.1)
185 activesupport (~> 4.0.0) 185 activesupport (~> 4.0.0)
186 charlock_holmes (~> 0.6.9) 186 charlock_holmes (~> 0.6.9)
187 gitlab-grit (~> 2.6.1) 187 gitlab-grit (~> 2.6.1)
@@ -590,7 +590,7 @@ DEPENDENCIES @@ -590,7 +590,7 @@ DEPENDENCIES
590 gitlab-gollum-lib (~> 1.1.0) 590 gitlab-gollum-lib (~> 1.1.0)
591 gitlab-grack (~> 2.0.0.pre) 591 gitlab-grack (~> 2.0.0.pre)
592 gitlab-linguist (~> 3.0.0) 592 gitlab-linguist (~> 3.0.0)
593 - gitlab_git (~> 5.7.0) 593 + gitlab_git (~> 5.7.1)
594 gitlab_meta (= 6.0) 594 gitlab_meta (= 6.0)
595 gitlab_omniauth-ldap (= 1.0.4) 595 gitlab_omniauth-ldap (= 1.0.4)
596 gon (~> 5.0.0) 596 gon (~> 5.0.0)