Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci

2 files changed, 36 insertions, 0 deletions

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
new file mode 100644
index 0000000..4e77d2b
--- /dev/null
+++ b/app/helpers/icons_helper.rb
@@ -0,0 +1,9 @@
+module IconsHelper
+  def boolean_to_icon(value)
+    if value.to_s == "true"
+      content_tag :i, nil, class: 'icon-circle cgreen'
+    else
+      content_tag :i, nil, class: 'icon-power-off clgray'
+    end
+  end
+end
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
new file mode 100644
index 0000000..a7f1dff
--- /dev/null
+++ b/app/helpers/routes_helper.rb
@@ -0,0 +1,27 @@
+module RoutesHelper
+  class Base
+    include Rails.application.routes.url_helpers
+
+    def default_url_options
+      {
+        host: Settings.gitlab_ci['host'],
+        protocol: Settings.gitlab_ci['https'] ? "https" : "http",
+        port: Settings.gitlab_ci['port']
+      }
+    end
+  end
+
+  def url_helpers
+    @url_helpers ||= Base.new
+  end
+
+  def self.method_missing(method, *args, &block)
+    @url_helpers ||= Base.new
+
+    if @url_helpers.respond_to?(method)
+      @url_helpers.send(method, *args, &block)
+    else
+      super method, *args, &block
+    end
+  end
+end