diff options
| author | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 19:53:51 +0100 |
|---|---|---|
| committer | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 19:53:51 +0100 |
| commit | fb6d7df347016726d84155d18b6d6f406d0121e9 (patch) | |
| tree | 9529bd4b546feeff391ca5a9db0a445f76a9521b /Gemfile.lock | |
| parent | 78588cfca15348ba062d33061c79df3cfa6b9883 (diff) | |
| parent | 7cc4b73942a0620678cd7e058d6dcde0ae71f4e6 (diff) | |
| download | gitlab-ce-fb6d7df347016726d84155d18b6d6f406d0121e9.tar.gz | |
Merge branch 'master' into avatar-cropping
Conflicts:
app/models/user.rb
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 a1e36c304e8..43c26396a30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -492,9 +492,9 @@ GEM rack (~> 1.2) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - omniauth (1.2.2) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.0, < 3) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) @@ -961,11 +961,11 @@ DEPENDENCIES mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) - nokogiri (= 1.6.7.2) + nokogiri (~> 1.6.7, >= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) octokit (~> 3.8.0) - omniauth (~> 1.2.2) + omniauth (~> 1.3.1) omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) |