diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-04 22:53:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-04 22:53:03 +0000 |
| commit | a6ad88b87a7dcf1a1a5d8dff91820a42d01284c9 (patch) | |
| tree | f72788a4de6a1bdc7b0ea9180f5cba682e6a14eb | |
| parent | af7e669e88b7bfd11d105d62c34a3d7ce0afeff1 (diff) | |
| parent | 39ec67255ac84e2ab9f6657aaed8855917ba70fe (diff) | |
| download | gitlab-ce-a6ad88b87a7dcf1a1a5d8dff91820a42d01284c9.tar.gz | |
Merge branch 'upgrade-newrelic-rpm' into 'master'
Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.
## What does this MR do?
While we intend to remove newrelic in the future, it'll probably not happen until 9.0 due to. In the meantime, I'd like to update the gem so it won't block Rails 5.
Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
## Why was this MR needed?
Rails 5 compatibility.
Relevant issues: #14286, #12860
See merge request !5553
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 866f5014847..460a6c409e7 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) |