summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-01-23 14:59:22 -0800
committerStan Hu <stanhu@gmail.com>2016-01-30 04:17:14 -0800
commit026c31dafc80059ec429b484dc28e03e91df2238 (patch)
tree10f8c7939b16c8a6e982ca64dd1cd085d3596107
parentd240876abaf800c1878102201b7ee18569ac1708 (diff)
downloadgitlab-ce-026c31dafc80059ec429b484dc28e03e91df2238.tar.gz
Bump New Relic gem version to avoid warnings in Web page
-rw-r--r--CHANGELOG1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0a21462ebdb..a8cbcdfe26d 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)
- Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
diff --git a/Gemfile b/Gemfile
index a09d44f8bfd..a1a9c776ae7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -299,7 +299,7 @@ group :production do
gem "gitlab_meta", '7.0'
end
-gem "newrelic_rpm", '~> 3.9.4.245'
+gem "newrelic_rpm", '~> 3.14'
gem 'newrelic-grape'
gem 'octokit', '~> 3.8.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index ec92964df25..4ca79ccd49f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -481,7 +481,7 @@ GEM
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,7 +961,7 @@ DEPENDENCIES
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)