diff --git a/Gemfile b/Gemfile index 5bc681c8e27e0aea98c6c9127ccee9980235c77d..7e4a091d1aa72af11b58d6e3d1835e94397226e3 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem 'gpgme', '~> 2.0.19' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' gem 'net-ldap', '~> 0.16.3' # API diff --git a/Gemfile.lock b/Gemfile.lock index efd43a58e516f9ba3dcb30420df2f4b30565ebe8..c656d98c914d5a19749e2ed0012391236274fa61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -549,9 +549,9 @@ GEM rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) - gitlab_omniauth-ldap (2.1.1) + gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) - omniauth (~> 1.3) + omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) globalid (1.0.0) @@ -1197,7 +1197,7 @@ GEM ruby2_keywords (0.0.5) ruby_parser (3.15.0) sexp_processor (~> 4.9) - rubyntlm (0.6.2) + rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) rugged (1.2.0) @@ -1573,7 +1573,7 @@ DEPENDENCIES gitlab-sidekiq-fetcher (= 0.8.0) gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) - gitlab_omniauth-ldap (~> 2.1.1) + gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) google-api-client (~> 0.33) google-protobuf (~> 3.19.0)