diff --git a/templates/gitlab.rb.erb b/templates/gitlab.rb.erb index e79cf138..3d5f05d0 100644 --- a/templates/gitlab.rb.erb +++ b/templates/gitlab.rb.erb @@ -55,16 +55,9 @@ git_data_dir "<%= @git_data_dir %>" # gitlab.yml configuration # ############################ - <%- @gitlab_rails.keys.sort.each do |k| -%> -<%- if k == 'ldap_servers' -%> -gitlab_rails['<%= k -%>'] = YAML.load <<-EOS -<%= sort_hash_by_key(@gitlab_rails[k]).to_yaml.gsub(/\s+$/,'').gsub(/---\s*\n/,'') %> -EOS - -<%- else -%> gitlab_rails['<%= k -%>'] = <%= decorate(@gitlab_rails[k]) %> -<%- end end end -%> +<%- end end -%> <%- if @user -%> ###############