Merge branch 'mk-fix-ldap-backwards-compatibility' into 'master'

Fix LDAP backwards compatibility

Closes gitlab-ce#36432 and #3082

See merge request !2690

changelogs/unreleased-ee/mk-fix-ldap-backwards-compatibility.yml

+---
+title: Fix LDAP backwards-compatibility when using "method" or when "verify_certificates" is not defined
+merge_request: 2690
+author:
+type: fixed

config/initializers/1_settings.rb

@@ -169,6 +169,7 @@ if Settings.ldap['enabled'] || Rails.env.test?
 
   Settings.ldap['servers'].each do |key, server|
     server = Settingslogic.new(server)
+
     server['label'] ||= 'LDAP'
     server['timeout'] ||= 10.seconds
     server['block_auto_created_users'] = false if server['block_auto_created_users'].nil?
@@ -179,7 +180,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
     server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
     server['external_groups'] = [] if server['external_groups'].nil?
     server['sync_ssh_keys'] = 'sshPublicKey' if server['sync_ssh_keys'].to_s == 'true'
-    Settings.ldap['servers'][key] = server
 
     # For backwards compatibility
     server['encryption'] ||= server['method']
@@ -198,6 +198,8 @@ if Settings.ldap['enabled'] || Rails.env.test?
       MSG
       Rails.logger.warn(message)
     end
+
+    Settings.ldap['servers'][key] = server
   end
 end