diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-07 11:20:03 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-07 11:20:03 +0000 |
| commit | 954dd7ce876330446698b32faa0f42659791336a (patch) | |
| tree | 91727b9075355e21c1fdf9d8191c3378aef17122 /Gemfile.lock | |
| parent | 0fbd6244ec8d06376b4130a4832dd77ce207fc5f (diff) | |
| parent | 9836017c709ee5179575647e8d93065eeb854137 (diff) | |
| download | gitlab-ce-954dd7ce876330446698b32faa0f42659791336a.tar.gz | |
Merge branch 'crowd' into 'master'
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 181b72e07e2..2df318f3382 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -434,6 +434,10 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) opennebula (4.12.1) json nokogiri @@ -821,6 +825,7 @@ DEPENDENCIES omniauth-saml (~> 1.4.0) omniauth-shibboleth omniauth-twitter + omniauth_crowd org-ruby (= 0.9.12) pg poltergeist (~> 1.6.0) |