diff options
author | Robert Speicher <robert@gitlab.com> | 2016-01-28 19:09:52 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-01-28 19:09:52 +0000 |
commit | 789e04835257b8d6be19eaab5da0e8f7ebd74153 (patch) | |
tree | 4092237e862c5a45e7d4348aad0f38983255d69d /lib/api/variables.rb | |
parent | f673401c030bd6e5ff536415e0c9f443738191d5 (diff) | |
parent | 1e666ce6958b2b911276d533a9efd699884f6a71 (diff) | |
download | gitlab-ce-789e04835257b8d6be19eaab5da0e8f7ebd74153.tar.gz |
Merge branch 'rs-ldap-user' into 'master'
Backport LDAP user assignment changes from EE
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
See merge request !2641
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions