-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'user_filter_auth' into 'master'
Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
Showing
- app/helpers/auth_helper.rb 1 addition, 1 deletionapp/helpers/auth_helper.rb
- changelogs/unreleased/user_filter_auth.yml 4 additions, 0 deletionschangelogs/unreleased/user_filter_auth.yml
- config/initializers/devise.rb 3 additions, 16 deletionsconfig/initializers/devise.rb
- lib/gitlab/ldap/adapter.rb 1 addition, 3 deletionslib/gitlab/ldap/adapter.rb
- lib/gitlab/ldap/authentication.rb 2 additions, 4 deletionslib/gitlab/ldap/authentication.rb
- lib/gitlab/ldap/config.rb 58 additions, 7 deletionslib/gitlab/ldap/config.rb
- spec/lib/gitlab/ldap/config_spec.rb 81 additions, 0 deletionsspec/lib/gitlab/ldap/config_spec.rb
Loading
Please register or sign in to comment