diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-26 12:14:42 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-26 12:14:42 -0500 |
| commit | b4af546820b00537c6a5053f6b21dc9805dc11c7 (patch) | |
| tree | 505745bec506be527c7a0e940b754b0960c77167 /Gemfile | |
| parent | 7fb477325eb7f1215a6ae128c9a3a300606d7fbe (diff) | |
| parent | 3b2d68d37d39047e25fbe0ae51cafa39f22805f8 (diff) | |
| download | gitlab-ce-b4af546820b00537c6a5053f6b21dc9805dc11c7.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -26,7 +26,7 @@ gem 'doorkeeper', '~> 4.2.0' gem 'doorkeeper-openid_connect', '~> 1.1.0' gem 'omniauth', '~> 1.4.2' gem 'omniauth-auth0', '~> 1.4.1' -gem 'omniauth-azure-oauth2', '~> 0.0.6' +gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' @@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.0' +gem 'nokogiri', '~> 1.8.1' # Diffs gem 'diffy', '~> 3.1.0' |