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 | |
| 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')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -31,6 +31,7 @@ gem 'omniauth-shibboleth' gem 'omniauth-kerberos', group: :kerberos gem 'omniauth-gitlab' gem 'omniauth-bitbucket' +gem 'omniauth-saml' gem 'doorkeeper', '2.1.3' gem "rack-oauth2", "~> 1.0.5" |