remove gitlab_ci config

3 files changed, 24 insertions, 63 deletions

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 689c3f3049d..3893bd45cf5 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -18,7 +18,19 @@ class Settings < Settingslogic
       host.start_with?('www.') ? host[4..-1] : host
     end
 
-    private
+    def build_gitlab_ci_url
+      if gitlab_on_standard_port?
+        custom_port = nil
+      else
+        custom_port = ":#{gitlab.port}"
+      end
+      [ gitlab.protocol,
+        "://",
+        gitlab.host,
+        custom_port,
+        gitlab.relative_url_root
+      ].join('')
+    end
 
     def build_gitlab_shell_ssh_path_prefix
       if gitlab_shell.ssh_port != 22
@@ -160,6 +172,16 @@ Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitla
 Settings.gitlab['restricted_signup_domains'] ||= []
 Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git']
 
+
+#
+# CI
+#
+Settings['gitlab_ci'] ||= Settingslogic.new({})
+Settings.gitlab_ci['all_broken_builds']   = true if Settings.gitlab_ci['all_broken_builds'].nil?
+Settings.gitlab_ci['add_pusher']          = false if Settings.gitlab_ci['add_pusher'].nil?
+Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)
+Settings.gitlab_ci['builds_path']         = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root + '/ci')
+
 #
 # Reply by email
 #
diff --git a/config/initializers/3_ci_settings.rb b/config/initializers/3_ci_settings.rb
deleted file mode 100644
index 5cdff48d316..00000000000
--- a/config/initializers/3_ci_settings.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-module Ci
-  class Settings < Settingslogic
-    source "#{Rails.root}/config/gitlab_ci.yml"
-    namespace Rails.env
-
-    class << self
-      def gitlab_ci_on_non_standard_port?
-        ![443, 80].include?(gitlab_ci.port.to_i)
-      end
-
-      private
-
-      def build_gitlab_ci_url
-        if gitlab_ci_on_non_standard_port?
-          custom_port = ":#{gitlab_ci.port}"
-        else
-          custom_port = nil
-        end
-        [ gitlab_ci.protocol,
-          "://",
-          gitlab_ci.host,
-          custom_port,
-          gitlab_ci.relative_url_root
-        ].join('')
-      end
-    end
-  end
-end
-
-
-#
-# GitlabCi
-#
-Ci::Settings['gitlab_ci'] ||= Settingslogic.new({})
-Ci::Settings.gitlab_ci['https']               = false if Ci::Settings.gitlab_ci['https'].nil?
-Ci::Settings.gitlab_ci['host']                ||= 'localhost'
-Ci::Settings.gitlab_ci['port']                ||= Ci::Settings.gitlab_ci.https ? 443 : 80
-Ci::Settings.gitlab_ci['relative_url_root']   ||= (ENV['RAILS_RELATIVE_URL_ROOT'] || '') + '/ci'
-Ci::Settings.gitlab_ci['protocol']            ||= Ci::Settings.gitlab_ci.https ? "https" : "http"
-Ci::Settings.gitlab_ci['email_from']          ||= "gitlab-ci@#{Ci::Settings.gitlab_ci.host}"
-Ci::Settings.gitlab_ci['support_email']       ||= Ci::Settings.gitlab_ci.email_from
-Ci::Settings.gitlab_ci['all_broken_builds']   = true if Ci::Settings.gitlab_ci['all_broken_builds'].nil?
-Ci::Settings.gitlab_ci['add_pusher']          = false if Ci::Settings.gitlab_ci['add_pusher'].nil?
-Ci::Settings.gitlab_ci['url']                 ||= Ci::Settings.send(:build_gitlab_ci_url)
-Ci::Settings.gitlab_ci['builds_path']         = File.expand_path(Ci::Settings.gitlab_ci['builds_path'] || "builds/", Rails.root + '/ci')
-
-# Compatibility with old config
-Ci::Settings['gitlab_server_urls'] ||= Ci::Settings['allowed_gitlab_urls']
-
-#
-# Backup
-#
-Ci::Settings['backup'] ||= Settingslogic.new({})
-Ci::Settings.backup['keep_time']  ||= 0
-Ci::Settings.backup['path']         = File.expand_path(Ci::Settings.backup['path'] || "tmp/backups/", Rails.root)
-Ci::Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'connection' => nil })
-# Convert upload connection settings to use symbol keys, to make Fog happy
-if Ci::Settings.backup['upload']['connection']
-  Ci::Settings.backup['upload']['connection'] = Hash[Ci::Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }]
-end
-Ci::Settings.backup['upload']['multipart_chunk_size'] ||= 104857600
diff --git a/config/initializers/4_ci_app.rb b/config/initializers/4_ci_app.rb
index 60a30bf3bb7..cac8edb32bf 100644
--- a/config/initializers/4_ci_app.rb
+++ b/config/initializers/4_ci_app.rb
@@ -5,6 +5,6 @@ module GitlabCi
   REGISTRATION_TOKEN = SecureRandom.hex(10)
 
   def self.config
-    Ci::Settings
+    Settings
   end
 end