Commit 84825b39 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in lib/settings.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 8928d85c
......@@ -56,7 +56,6 @@ class Settings < Settingslogic
(base_url(gitlab) + [gitlab.relative_url_root]).join('')
end
<<<<<<< HEAD
def kerberos_protocol
kerberos.https ? "https" : "http"
end
......@@ -82,8 +81,6 @@ class Settings < Settingslogic
kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url)
end
=======
>>>>>>> upstream/master
# check that values in `current` (string or integer) is a contant in `modul`.
def verify_constant_array(modul, current, default)
values = default || []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment