summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2017-08-31 00:39:21 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-31 00:39:21 +0000
commitb2178c1d851411bb2d630246f45541cd1bceecc7 (patch)
tree3500dc1ed6da504b1dad678356d26c06377dddd8 /Gemfile
parent3cc6e4c602177177f975f7457f849643ba633996 (diff)
downloadgitlab-ce-b2178c1d851411bb2d630246f45541cd1bceecc7.tar.gz
Upgrade mail and nokogiri gems due to security issues
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 8bcf1278267..a05747e9ef5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ 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-cas3', '~> 1.1.2'
+gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.2'
@@ -126,12 +126,9 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.2'
gem 'asciidoctor-plantuml', '0.0.7'
gem 'rouge', '~> 2.0'
-gem 'truncato', '~> 0.7.8'
+gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7.0'
-
-# 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', '>= 1.6.7.2'
+gem 'nokogiri', '~> 1.8.0'
# Diffs
gem 'diffy', '~> 3.1.0'
@@ -245,7 +242,7 @@ gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
-gem 'gemojione', '~> 3.0'
+gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'