• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-01 · cd63df1a
    GitLab Bot authored
    # Conflicts:
    #	app/helpers/auth_helper.rb
    #	lib/gitlab/auth/ldap/access.rb
    #	lib/gitlab/auth/ldap/adapter.rb
    #	lib/gitlab/auth/ldap/config.rb
    #	lib/gitlab/auth/ldap/person.rb
    #	lib/gitlab/auth/ldap/user.rb
    #	lib/gitlab/auth/o_auth/auth_hash.rb
    #	lib/gitlab/auth/o_auth/user.rb
    #	lib/gitlab/auth/saml/config.rb
    #	lib/gitlab/auth/saml/user.rb
    #	spec/lib/gitlab/auth/ldap/access_spec.rb
    #	spec/lib/gitlab/auth/ldap/user_spec.rb
    #	spec/support/ldap_helpers.rb
    
    [ci skip]
    cd63df1a
spec_helper.rb 7.29 KB