diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-05-14 14:22:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-05-14 14:22:26 +0000 |
| commit | c2ee828c19cb245809647428334b8ef215536a0d (patch) | |
| tree | 27a00bc43a61ad5a07a6577281cbb21ea71371d3 /Gemfile | |
| parent | 910794bae5a91479f41468ebc345db680a33b20e (diff) | |
| parent | b17f36f040a18ff6700881c56607ba6df436f652 (diff) | |
| download | gitlab-ce-c2ee828c19cb245809647428334b8ef215536a0d.tar.gz | |
Merge branch 'omniauth-csrf' into 'master'
Protect OmniAuth request phase against CSRF.
Addresses #2268.
See merge request !1793
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -23,7 +23,7 @@ gem "pg", group: :postgres # Auth gem "devise", '3.2.4' gem "devise-async", '0.9.0' -gem 'omniauth', "~> 1.1.3" +gem 'omniauth', "~> 1.2.2" gem 'omniauth-google-oauth2' gem 'omniauth-twitter' gem 'omniauth-github' |