From f64db1fab95751bc2b1cf04641bb031d6289d16b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 13 Apr 2015 11:22:31 +0200 Subject: Try to explain what we are doing --- db/migrate/20150411000035_fix_identities.rb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'db/migrate') diff --git a/db/migrate/20150411000035_fix_identities.rb b/db/migrate/20150411000035_fix_identities.rb index 93beb046d78..b65ad138b0f 100644 --- a/db/migrate/20150411000035_fix_identities.rb +++ b/db/migrate/20150411000035_fix_identities.rb @@ -1,5 +1,14 @@ class FixIdentities < ActiveRecord::Migration def up + # Up until now, legacy 'ldap' references in the database were charitably + # interpreted to point to the first LDAP server specified in the GitLab + # configuration. So if the database said 'provider: ldap' but the first + # LDAP server was called 'ldapmain', then we would try to interpret + # 'provider: ldap' as if it said 'provider: ldapmain'. This migration (and + # accompanying changes in the GitLab LDAP code) get rid of this complicated + # behavior. Any database references to 'provider: ldap' get rewritten to + # whatever the code would have interpreted it as, i.e. as a reference to + # the first LDAP server specified in gitlab.yml / gitlab.rb. new_provider = Gitlab.config.ldap.servers.first.last['provider_name'] # Delete duplicate identities -- cgit v1.2.3