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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9940ab15242..ef7487ae5bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,9 +362,9 @@ GEM rack (~> 1.2) octokit (3.7.0) sawyer (~> 0.6.0, >= 0.5.3) - omniauth (1.1.4) - hashie (>= 1.2, < 3) - rack + omniauth (1.2.2) + hashie (>= 1.2, < 4) + rack (~> 1.0) omniauth-bitbucket (0.0.2) multi_json (~> 1.7) omniauth (~> 1.1) @@ -751,7 +751,7 @@ DEPENDENCIES newrelic_rpm nprogress-rails octokit (= 3.7.0) - omniauth (~> 1.1.3) + omniauth (~> 1.2.2) omniauth-bitbucket omniauth-github omniauth-gitlab |