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 | |
| 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')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres gem 'devise', '~> 3.5.4' gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.2.0' -gem 'omniauth', '~> 1.2.2' +gem 'omniauth', '~> 1.3.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' @@ -108,7 +108,7 @@ gem 'rouge', '~> 1.10.1' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM -gem 'nokogiri', '1.6.7.2' +gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs gem 'diffy', '~> 3.0.3' |