summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authoregrieff <egrieff@gitlab.com>2019-05-27 09:48:03 +0100
committeregrieff <egrieff@gitlab.com>2019-05-27 09:48:03 +0100
commit96d8f009bc762b94e66fa96e5a38f3e3ee2faeb0 (patch)
treefec12a98a390b74892c8d035b4b461b9cf94e921 /Gemfile
parentfd4a86884947866dff7d7165917336d094c8b276 (diff)
parent348d779beab593e0e852f5a4d285ea58db75a048 (diff)
downloadgitlab-ce-96d8f009bc762b94e66fa96e5a38f3e3ee2faeb0.tar.gz
Merge branch 'master' into 57825-moving-an-issue-results-in-broken-image-links-in-comments57825-moving-an-issue-results-in-broken-image-links-in-comments
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index e2842ca27db..f5f963bb2ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -361,7 +361,7 @@ group :development, :test do
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.31.0', require: false
- gem 'simplecov', '~> 0.14.0', require: false
+ gem 'simplecov', '~> 0.16.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -372,6 +372,7 @@ group :development, :test do
gem 'activerecord_sane_schema_dumper', '1.0'
gem 'stackprof', '~> 0.2.10', require: false
+ gem 'derailed_benchmarks', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false
@@ -399,6 +400,8 @@ gem 'html2text'
gem 'ruby-prof', '~> 0.17.0'
gem 'rbtrace', '~> 0.4', require: false
+gem 'memory_profiler', '~> 0.9', require: false
+gem 'benchmark-memory', '~> 0.1', require: false
# OAuth
gem 'oauth2', '~> 1.4'