summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 12:06:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 12:06:40 +0000
commit0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (patch)
tree9ff7dd7b21a3f9642a8fbb45c922f71a433faf02 /Gemfile.lock
parenta048261403ea7e12992ccffe704f0779235712d7 (diff)
downloadgitlab-ce-0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 10 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a568e0c59e0..4563c2d53c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -460,17 +460,16 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
- haml (5.0.4)
+ haml (5.1.2)
temple (>= 0.8.0)
tilt
- haml_lint (0.31.0)
- haml (>= 4.0, < 5.1)
+ haml_lint (0.34.0)
+ haml (>= 4.0, < 5.2)
rainbow
- rake (>= 10, < 13)
rubocop (>= 0.50.0)
sysexits (~> 1.1)
- hamlit (2.8.8)
- temple (>= 0.8.0)
+ hamlit (2.10.0)
+ temple (>= 0.8.2)
thor
tilt
hangouts-chat (0.0.5)
@@ -484,7 +483,7 @@ GEM
hipchat (1.5.2)
httparty
mimemagic
- html-pipeline (2.8.4)
+ html-pipeline (2.12.2)
activesupport (>= 2)
nokogiri (>= 1.4)
html2text (0.2.0)
@@ -1017,7 +1016,7 @@ GEM
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
- temple (0.8.1)
+ temple (0.8.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.10.0)
@@ -1219,13 +1218,13 @@ DEPENDENCIES
grpc (~> 1.24.0)
gssapi
guard-rspec
- haml_lint (~> 0.31.0)
- hamlit (~> 2.8.8)
+ haml_lint (~> 0.34.0)
+ hamlit (~> 2.10.0)
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
hipchat (~> 1.5.0)
- html-pipeline (~> 2.8)
+ html-pipeline (~> 2.12)
html2text
httparty (~> 0.16.4)
icalendar