summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-28 10:02:49 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-28 10:02:49 -0600
commit39ec67255ac84e2ab9f6657aaed8855917ba70fe (patch)
tree73db05235e7aeb965f1ffedd9e1e8a230e02bf5a
parentb24ccd4a67f60731ce2eb6be0129e8cf7228263d (diff)
downloadgitlab-ce-upgrade-newrelic-rpm.tar.gz
Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpm
Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 071277de068..f96ab3ad0b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -326,7 +326,7 @@ group :production do
gem 'gitlab_meta', '7.0'
end
-gem 'newrelic_rpm', '~> 3.14'
+gem 'newrelic_rpm', '~> 3.16'
gem 'octokit', '~> 4.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 670578dec6d..c5468f5db78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
nested_form (0.3.2)
net-ldap (0.12.1)
net-ssh (3.0.1)
- newrelic_rpm (3.14.1.311)
+ newrelic_rpm (3.16.0.318)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
@@ -902,7 +902,7 @@ DEPENDENCIES
mysql2 (~> 0.3.16)
nested_form (~> 0.3.2)
net-ssh (~> 3.0.1)
- newrelic_rpm (~> 3.14)
+ newrelic_rpm (~> 3.16)
nokogiri (~> 1.6.7, >= 1.6.7.2)
oauth2 (~> 1.2.0)
octokit (~> 4.3.0)