diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-07 14:20:03 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-07 14:20:03 +0300 |
| commit | 954dd7ce876330446698b32faa0f42659791336a (patch) | |
| tree | 91727b9075355e21c1fdf9d8191c3378aef17122 /Gemfile | |
| parent | 0fbd6244ec8d06376b4130a4832dd77ce207fc5f (diff) | |
| parent | 9836017c709ee5179575647e8d93065eeb854137 (diff) | |
Merge branch 'crowd' into 'master'
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -25,6 +25,7 @@ gem 'omniauth-kerberos', group: :kerberos gem 'omniauth-gitlab' gem 'omniauth-bitbucket' gem 'omniauth-saml', '~> 1.4.0' +gem 'omniauth_crowd' gem 'doorkeeper', '2.1.3' gem "rack-oauth2", "~> 1.0.5" |