diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-29 10:37:27 +0000 |
| commit | 70b29c3576f646371c3a5bee312b921a3053fb70 (patch) | |
| tree | a0d7ccb7dbe8cec32de964d15e4ede1f14bea809 /Gemfile.lock | |
| parent | aa97325deae515f45c047df3640d7b1f07247038 (diff) | |
| parent | 22de5443c5c37772e090268ed115b88d12427cc4 (diff) | |
| download | gitlab-ce-70b29c3576f646371c3a5bee312b921a3053fb70.tar.gz | |
Merge branch 'feature/saml_support' into 'master'
Add SAML support via Omniauth
Split of !669, with doc
See merge request !722
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d1e311c2d49..cc373f5a0d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -327,6 +327,8 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.4) + macaddr (1.7.1) + systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) @@ -383,6 +385,9 @@ GEM omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) + omniauth-saml (1.3.1) + omniauth (~> 1.1) + ruby-saml (~> 0.8.1) omniauth-shibboleth (1.1.1) omniauth (>= 1.0.0) omniauth-twitter (1.0.1) @@ -516,6 +521,9 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.1) + ruby-saml (0.8.2) + nokogiri (>= 1.5.0) + uuid (~> 2.3) ruby2ruby (2.1.3) ruby_parser (~> 3.1) sexp_processor (~> 4.0) @@ -601,6 +609,7 @@ GEM stamp (0.5.0) state_machine (1.2.0) stringex (2.5.2) + systemu (2.6.5) task_list (1.0.2) html-pipeline teaspoon (1.0.2) @@ -653,6 +662,8 @@ GEM raindrops (~> 0.7) unicorn-worker-killer (0.4.2) unicorn (~> 4) + uuid (2.3.7) + macaddr (~> 1.0) version_sorter (2.0.0) virtus (1.0.1) axiom-types (~> 0.0.5) @@ -755,6 +766,7 @@ DEPENDENCIES omniauth-gitlab omniauth-google-oauth2 omniauth-kerberos + omniauth-saml omniauth-shibboleth omniauth-twitter org-ruby (= 0.9.12) |