diff options
| author | Drew Blessing <drew@gitlab.com> | 2018-07-17 14:18:21 -0500 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2018-07-17 14:18:21 -0500 |
| commit | 9240e96241f956b55bb1b07e555308a429ab5892 (patch) | |
| tree | 8ff9dcca9466a4de7868019b50a41bfd830d55f8 | |
| parent | d8fd483f6b34aaf529a8011d0a95f2afce7572e9 (diff) | |
| download | gitlab-ce-add_ldap_tls_options.tar.gz | |
Resolve Gemfile.lock conflictsadd_ldap_tls_options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -76,7 +76,7 @@ gem 'gpgme' # 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.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.0', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki diff --git a/Gemfile.lock b/Gemfile.lock index 1b8a777ceb4..1376b2e513d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -316,7 +316,7 @@ GEM rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.0) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -1044,7 +1044,7 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.0) gon (~> 6.2) google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) |