Commit 22494311 authored by azul's avatar azul

Merge branch '175-remove-migrations-from-pre-castlegates-to-castlegates' into 'master'

Fix: update nokogiri and keep sprockets version

Closes #175

See merge request !169
parents 574eb39d 56bb9676
Pipeline #17708 failed with stage
in 17 minutes and 35 seconds
......@@ -15,9 +15,9 @@ end
gem 'rails', '~> 4.2.10'
# Security updates for dependencies not updated in rails 4.2 yet
# see https://cve.circl.lu/cve/CVE-2018-3741 ,
# https://github.com/flavorjones/loofah/issues/144
gem 'rails-html-sanitizer', '~> 1.0.4'
# https://github.com/sharesight/help.sharesight.com/pull/17
gem 'nokogiri', '~> 1.8.3'
gem 'sprockets', '~> 3.7.2'
# Rake is rubys make... performing tasks
# locking in to latest major to fix API
......
......@@ -138,7 +138,7 @@ GEM
mini_portile2 (2.3.0)
minitest (5.10.3)
mysql2 (0.3.21)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
phantomjs-binaries (2.1.1.1)
sys-uname (= 0.9.0)
......@@ -271,12 +271,12 @@ DEPENDENCIES
mime-types
minitest
mysql2 (~> 0.3.18)
nokogiri (~> 1.8.3)
phantomjs-binaries (~> 2.1.1)
poltergeist (~> 1.5)
prototype-rails!
pundit (~> 1.1)
rails (~> 4.2.10)
rails-html-sanitizer (~> 1.0.4)
rake (~> 10.0)
rubyzip (~> 1.2.1)
sass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment