Merge branch 'github_importer'

Conflicts:
	app/helpers/projects_helper.rb

1 files changed, 16 insertions, 0 deletions

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 786a386c0ea..fef21368254 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -242,4 +242,20 @@ module ProjectsHelper
     url_params = is_newest ? {} : { version_id: version }
     project_wiki_path(proj, page, url_params)
   end
+
+  def project_status_css_class(status)
+    case status
+    when "started"
+      "active"
+    when "failed"
+      "danger"
+    when "finished"
+      "success"
+    end
+  end
+
+  def github_import_enabled?
+    Gitlab.config.omniauth.enabled && enabled_oauth_providers.include?(:github)
+  end
 end
+