summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-02 16:09:32 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-02 16:09:32 +0000
commit5af15baae6f75efabeb4f14a57b70a57f567f689 (patch)
tree9260e3fe0543382424f0375f31e5afb8a90f6ae5 /Gemfile
parent30313098a0bd04280d5612a8072dd0638cc4e5fa (diff)
parent2828274b418cccc8171692495dd2856209dbfa49 (diff)
downloadgitlab-ce-5af15baae6f75efabeb4f14a57b70a57f567f689.tar.gz
Merge branch 'update-newrelic-gem' into 'master'
Bump New Relic gem version to avoid warnings in Web page This version has support for Grape, so we should consider removing the newrelic-grape gem as well: https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation See merge request !2578
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 3f83a47a3c2..e70d816b102 100644
--- a/Gemfile
+++ b/Gemfile
@@ -302,8 +302,7 @@ group :production do
gem "gitlab_meta", '7.0'
end
-gem "newrelic_rpm", '~> 3.9.4.245'
-gem 'newrelic-grape'
+gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 3.8.0'