summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-06 10:03:41 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-06 10:03:41 +0300
commitc010c8a92cecc6d85661fdb9b989787020d27f11 (patch)
tree3308115e79a6da62f3e94bf9f821e86617439331 /config
parent71e62cb0576f0d9a232c5d33cdc5015527091cf5 (diff)
downloadgitlab-ci-c010c8a92cecc6d85661fdb9b989787020d27f11.tar.gz
Compatibility with old configs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 3818669..8b9703a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -41,6 +41,8 @@ Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_broken
Settings.gitlab_ci['add_committer'] = false if Settings.gitlab_ci['add_committer'].nil?
Settings.gitlab_ci['url'] ||= Settings.send(:build_gitlab_ci_url)
+# Compatibility with old config
+Settings['gitlab_server_urls'] ||= Settings['allowed_gitlab_urls']
#
# Gravatar