summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-07-25 15:39:16 +0000
committerDouwe Maan <douwe@gitlab.com>2018-07-25 15:39:16 +0000
commitd8e759802ec28c89ab0b07d6d748748dda3254a6 (patch)
tree53f3fb71b4addf2e161448a3d69a161f93c2c2a5 /Gemfile.lock
parent3f14c56bfe77e83084b58dc2bd3c34e3c84c6cae (diff)
parentb755673fb63b57751657a55f568ca809e5c7901e (diff)
downloadgitlab-ce-d8e759802ec28c89ab0b07d6d748748dda3254a6.tar.gz
Merge branch 'sh-include-rbtrace' into 'master'
Add rbtrace to Gemfile See merge request gitlab-org/gitlab-ce!20831
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 5bb7bc53962..f370adfc810 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -700,6 +700,10 @@ GEM
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
+ rbtrace (0.4.10)
+ ffi (>= 1.0.6)
+ msgpack (>= 0.4.3)
+ trollop (>= 1.16.2)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.0.0)
@@ -911,6 +915,7 @@ GEM
parslet (~> 1.5.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
+ trollop (2.1.3)
truncato (0.7.10)
htmlentities (~> 4.3.1)
nokogiri (~> 1.8.0, >= 1.7.0)
@@ -1133,6 +1138,7 @@ DEPENDENCIES
rainbow (~> 2.2)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
+ rbtrace (~> 0.4)
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)