Fix GitHub project's link on import page when provider has a custom URL

2 files changed, 20 insertions, 2 deletions

diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb
new file mode 100644
index 00000000000..109bc1a02d1
--- /dev/null
+++ b/app/helpers/import_helper.rb
@@ -0,0 +1,18 @@
+module ImportHelper
+  def github_project_link(path_with_namespace)
+    link_to path_with_namespace, github_project_url(path_with_namespace), target: '_blank'
+  end
+
+  private
+
+  def github_project_url(path_with_namespace)
+    "#{github_root_url}/#{path_with_namespace}"
+  end
+
+  def github_root_url
+    return @github_url if defined?(@github_url)
+
+    provider = Gitlab.config.omniauth.providers.find { |p| p.name == 'github' }
+    @github_url = provider.fetch('url', 'https://github.com') if provider
+  end
+end
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 9639da4cb58..5b7f11440c1 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -26,7 +26,7 @@
       - @already_added_projects.each do |project|
         %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
           %td
-            = link_to project.import_source, "https://github.com/#{project.import_source}", target: "_blank"
+            = github_project_link(project.import_source)
           %td
             = link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
           %td.job-status
@@ -43,7 +43,7 @@
       - @repos.each do |repo|
         %tr{id: "repo_#{repo.id}"}
           %td
-            = link_to repo.full_name, "https://github.com/#{repo.full_name}", target: "_blank"
+            = github_project_link(repo.full_name)
           %td.import-target
             = repo.full_name
           %td.import-actions.job-status