diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-11 11:44:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-11 11:44:44 +0000 |
| commit | a3d3e962f1f125e34d183144d76fb3a8356253b8 (patch) | |
| tree | ee7c08523fec92dddfa937625c0252536cfd1da4 | |
| parent | 539152bcafcc40d11952e6c7ac0f2a6a71a88baa (diff) | |
| parent | 6debb556900ea8eed996e5ae5b580d30652875aa (diff) | |
| download | gitlab-ce-a3d3e962f1f125e34d183144d76fb3a8356253b8.tar.gz | |
Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'
Bumps omniauth-ldap gem version to 2.0.4
Closes #25637
See merge request !13465
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/bump-omniauth-ldap-gem-version-2-0-4.yml | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -64,7 +64,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.3', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki diff --git a/Gemfile.lock b/Gemfile.lock index 79d1bc51358..3d435b6f901 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.1) - gitlab_omniauth-ldap (2.0.3) + gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -988,7 +988,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) - gitlab_omniauth-ldap (~> 2.0.3) + gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) diff --git a/changelogs/unreleased/bump-omniauth-ldap-gem-version-2-0-4.yml b/changelogs/unreleased/bump-omniauth-ldap-gem-version-2-0-4.yml new file mode 100644 index 00000000000..7571999fa75 --- /dev/null +++ b/changelogs/unreleased/bump-omniauth-ldap-gem-version-2-0-4.yml @@ -0,0 +1,4 @@ +--- +title: Bumps omniauth-ldap gem version to 2.0.4 +merge_request: 13465 +author: |