diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-04-13 11:52:05 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-04-13 11:52:05 +0200 |
| commit | 8476d171cc0fd3ab7d01c078afea29ad434178c7 (patch) | |
| tree | b1075a5c3f8060af06e57280d4bc1396f0983dde /db | |
| parent | ec7a68a1a5c7df1a1710eb1df31e410f6c171289 (diff) | |
| parent | 04f05ac1fb43904229bc084813dab92e82343f02 (diff) | |
| download | gitlab-ce-8476d171cc0fd3ab7d01c078afea29ad434178c7.tar.gz | |
Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_migration
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20150411000035_fix_identities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20150411000035_fix_identities.rb b/db/migrate/20150411000035_fix_identities.rb index 297e7eaa5e9..d4c6e545204 100644 --- a/db/migrate/20150411000035_fix_identities.rb +++ b/db/migrate/20150411000035_fix_identities.rb @@ -22,7 +22,7 @@ class FixIdentities < ActiveRecord::Migration # Update legacy identities execute "UPDATE identities SET provider = '#{new_provider}' WHERE provider = 'ldap';" - if defined?(LdapGroupLink) + if table_exists?('ldap_group_links') execute "UPDATE ldap_group_links SET provider = '#{new_provider}' WHERE provider IS NULL;" end end |