Merge branch 'ldap_group_links' into 'master'

Fix LDAP group links API is not working as expected.

Fixes #329

See merge request !494

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.1.0
+  - Fix: LDAP group links API is not working as expected.
+
 v 8.0.1
   - Improve CI migration procedure and documentation
 

app/models/ldap_group_link.rb

@@ -5,6 +5,7 @@ class LdapGroupLink < ActiveRecord::Base
   validates :cn, :group_access, :group_id, presence: true
   validates :cn, uniqueness: { scope: [:group_id, :provider] }
   validates :group_access, inclusion: { in: Gitlab::Access.all_values }
+  validates :provider, presence: true
 
   scope :with_provider, ->(provider) { where(provider: provider) }
 

db/migrate/20151007110107_update_group_links.rb

+class UpdateGroupLinks < ActiveRecord::Migration
+  def change
+    provider = quote_string(Gitlab::LDAP::Config.providers.first)
+    execute("UPDATE ldap_group_links SET provider = '#{provider}' WHERE provider IS NULL")
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150930110012) do
+ActiveRecord::Schema.define(version: 20151007110107) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"