diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-02 16:09:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-02 16:09:32 +0000 |
| commit | 5af15baae6f75efabeb4f14a57b70a57f567f689 (patch) | |
| tree | 9260e3fe0543382424f0375f31e5afb8a90f6ae5 | |
| parent | 30313098a0bd04280d5612a8072dd0638cc4e5fa (diff) | |
| parent | 2828274b418cccc8171692495dd2856209dbfa49 (diff) | |
| download | gitlab-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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index f207e0c5316..7a9b51cf331 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.5.0 (unreleased) - Ensure rake tasks that don't need a DB connection can be run without one + - Update New Relic gem to 3.14.1.311 (Stan Hu) - Add "visibility" flag to GET /projects api endpoint - Ignore binary files in code search to prevent Error 500 (Stan Hu) - Render sanitized SVG images (Stan Hu) @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 8c6e01ede84..418f8ee2af2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -478,10 +478,7 @@ GEM net-ldap (0.12.1) net-ssh (3.0.1) netrc (0.11.0) - newrelic-grape (2.1.0) - grape - newrelic_rpm - newrelic_rpm (3.9.4.245) + newrelic_rpm (3.14.1.311) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nprogress-rails (0.1.6.7) @@ -961,8 +958,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) - newrelic-grape - newrelic_rpm (~> 3.9.4.245) + newrelic_rpm (~> 3.14) nokogiri (= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) |