Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/gitlab/dependency_linker/godeps_json_linker.rb b/lib/gitlab/dependency_linker/godeps_json_linker.rb
index 9166e9091ac..d24c137793e 100644
--- a/lib/gitlab/dependency_linker/godeps_json_linker.rb
+++ b/lib/gitlab/dependency_linker/godeps_json_linker.rb
@@ -12,12 +12,10 @@ module Gitlab
       def link_dependencies
         link_json('ImportPath') do |path|
           case path
-          when %r{\A(?<repo>github\.com/#{REPO_REGEX})/(?<path>.+)\z}
-            "https://#{$~[:repo]}/tree/master/#{$~[:path]}"
           when %r{\A(?<repo>gitlab\.com/#{NESTED_REPO_REGEX})\.git/(?<path>.+)\z},
-            %r{\A(?<repo>gitlab\.com/#{REPO_REGEX})/(?<path>.+)\z}
+              %r{\A(?<repo>git(lab|hub)\.com/#{REPO_REGEX})/(?<path>.+)\z}
 
-            "https://#{$~[:repo]}/-/tree/master/#{$~[:path]}"
+            "https://#{$~[:repo]}/tree/master/#{$~[:path]}"
           when /\Agolang\.org/
             "https://godoc.org/#{path}"
           else