diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 19:24:14 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 19:24:14 +0300 |
| commit | 4a5719f99075a1bdcce727899e9186ac78d096f0 (patch) | |
| tree | 15315fda2a016926be8c8319ab63d01a0caa8845 /Gemfile.lock | |
| parent | e31ba68732d1e5f30cec973d93dcea75a283b81b (diff) | |
| parent | f8ec9dd397a1088271766da22ee372a24b64b291 (diff) | |
| download | gitlab-ce-4a5719f99075a1bdcce727899e9186ac78d096f0.tar.gz | |
Merge pull request #7725 from matusb/feature/shibboleth-support
shibboleth authentication support
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a39935ac927..e8636fd7ac5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,6 +321,8 @@ GEM omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) + omniauth-shibboleth (1.1.1) + omniauth (>= 1.0.0) omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) @@ -644,6 +646,7 @@ DEPENDENCIES omniauth-github omniauth-google-oauth2 omniauth-twitter + omniauth-shibboleth org-ruby pg poltergeist (~> 1.5.1) |