diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-10-02 18:24:48 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-10-02 18:24:48 +0300 |
commit | b40192a9464503bf4b141f8cf6133d7ba0f893fe (patch) | |
tree | b88f2ecfa2a6d0eca0e00dc09d30dcc16af4d32b /spec/lib/gitlab/workhorse_spec.rb | |
parent | 4716e81f9dc73b95e45df26fd339b75aaf6b48f6 (diff) | |
parent | 011c168bff7174ce4b2defe239aa8d5031aa8269 (diff) |
Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'
Attempt to link saml users to ldap by email
Closes #33493
See merge request gitlab-org/gitlab-ce!14216
Diffstat (limited to 'spec/lib/gitlab/workhorse_spec.rb')
0 files changed, 0 insertions, 0 deletions