summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 18:09:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 18:09:00 +0000
commitc57e10faab0abb213e7a18274fd5a98ba87a5c09 (patch)
treede0195e28dfe19fbfeb5bffa8fde4f511288d8ef /Gemfile
parent11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (diff)
downloadgitlab-ce-c57e10faab0abb213e7a18274fd5a98ba87a5c09.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 18da93d2a05..c203a98567c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -381,8 +381,6 @@ group :development, :test do
gem 'knapsack', '~> 1.17'
- gem 'stackprof', '~> 0.2.13', require: false
-
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
@@ -427,6 +425,7 @@ gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
gem 'ruby-prof', '~> 1.0.0'
+gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
gem 'benchmark-memory', '~> 0.1', require: false