diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-04 15:23:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-04 15:23:38 +0000 |
| commit | 5df6b0b758821089c3685e3252b80c66ef6b1bc9 (patch) | |
| tree | 9a166ad13ca283fd586e1cfaa05886b2f6effaac /Gemfile.lock | |
| parent | 3f05c22f5612c26ff3707aa16eb0f3c8be18ec93 (diff) | |
| parent | 05eb9e7884a1a1eb4144f84e7f586d26b011f4f1 (diff) | |
| download | gitlab-ce-5df6b0b758821089c3685e3252b80c66ef6b1bc9.tar.gz | |
Merge branch 'facebook-auth' into 'master'
Add Facebook authentication
See merge request !1740
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 030191fb80c..dce728baf18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,6 +423,8 @@ GEM multi_json (~> 1.7) omniauth (~> 1.1) omniauth-oauth (~> 1.0) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) @@ -859,6 +861,7 @@ DEPENDENCIES octokit (~> 3.7.0) omniauth (~> 1.2.2) omniauth-bitbucket (~> 0.0.2) + omniauth-facebook (~> 3.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.2.0) |