summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-06-15 16:26:45 +0200
committerDouwe Maan <douwe@selenight.nl>2018-06-18 10:54:05 +0200
commitb4c1080494069f81be4c733fdad52a51d1f0d682 (patch)
tree425019581a85605827cddb66c4030ea4660ab7c5
parent535c322481ed9147f22865ffc19212ad817613a5 (diff)
downloadgitlab-ce-b4c1080494069f81be4c733fdad52a51d1f0d682.tar.gz
Update Gemfile.rails5.lock
-rw-r--r--Gemfile.rails5.lock12
1 files changed, 8 insertions, 4 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 952e27df29d..51a4d954e9c 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -299,13 +299,13 @@ GEM
flowdock (~> 0.7)
gitlab-grit (>= 2.4.1)
multi_json
- gitlab-gollum-lib (4.2.7.2)
+ gitlab-gollum-lib (4.2.7.5)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 3.1)
- sanitize (~> 2.1)
+ sanitize (~> 4.6.4)
stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4)
mime-types (>= 1.15)
@@ -519,6 +519,8 @@ GEM
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
+ nokogumbo (1.5.0)
+ nokogiri
numerizer (0.1.1)
oauth (0.5.4)
oauth2 (1.4.0)
@@ -814,8 +816,10 @@ GEM
et-orbi (~> 1.0)
rugged (0.27.1)
safe_yaml (1.0.4)
- sanitize (2.1.0)
+ sanitize (4.6.5)
+ crass (~> 1.0.2)
nokogiri (>= 1.4.4)
+ nokogumbo (~> 1.4)
sass (3.5.5)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
@@ -1164,7 +1168,7 @@ DEPENDENCIES
ruby_parser (~> 3.8)
rufus-scheduler (~> 3.4)
rugged (~> 0.27)
- sanitize (~> 2.0)
+ sanitize (~> 4.6.5)
sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)