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 | |
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')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -19,6 +19,7 @@ gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.1.3' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' +gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.2.0' |