Commit 25b7a1ce authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'bring-back-newrelic-gem' into 'master'

Revert "Remove newrelic gem. Closes #12860"

This reverts commit 53176717.

Conflicts:
	Gemfile.lock

See merge request !2943
parent 85f3dabe
...@@ -11,6 +11,7 @@ v 8.5.1 ...@@ -11,6 +11,7 @@ v 8.5.1
- Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec) - Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
- Restrict permissions on public/uploads - Restrict permissions on public/uploads
- Add when the Builds & Runners API changes got introduced - Add when the Builds & Runners API changes got introduced
- Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
- Update sentry-raven gem to 0.15.6 - Update sentry-raven gem to 0.15.6
v 8.5.0 v 8.5.0
......
...@@ -303,6 +303,8 @@ group :production do ...@@ -303,6 +303,8 @@ group :production do
gem "gitlab_meta", '7.0' gem "gitlab_meta", '7.0'
end end
gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 3.8.0' gem 'octokit', '~> 3.8.0'
gem "mail_room", "~> 0.6.1" gem "mail_room", "~> 0.6.1"
......
...@@ -479,6 +479,7 @@ GEM ...@@ -479,6 +479,7 @@ GEM
net-ldap (0.12.1) net-ldap (0.12.1)
net-ssh (3.0.1) net-ssh (3.0.1)
netrc (0.11.0) netrc (0.11.0)
newrelic_rpm (3.14.1.311)
nokogiri (1.6.7.2) nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.0.0.rc2)
nprogress-rails (0.1.6.7) nprogress-rails (0.1.6.7)
...@@ -960,6 +961,7 @@ DEPENDENCIES ...@@ -960,6 +961,7 @@ DEPENDENCIES
nested_form (~> 0.3.2) nested_form (~> 0.3.2)
net-ssh (~> 3.0.1) net-ssh (~> 3.0.1)
nokogiri (~> 1.6.7, >= 1.6.7.2) nokogiri (~> 1.6.7, >= 1.6.7.2)
newrelic_rpm (~> 3.14)
nprogress-rails (~> 0.1.6.7) nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0) oauth2 (~> 1.0.0)
octokit (~> 3.8.0) octokit (~> 3.8.0)
......
# New Relic configuration file
#
# This file is here to make sure the New Relic gem stays
# quiet by default.
#
# To enable and configure New Relic, please use
# environment variables, e.g. NEW_RELIC_ENABLED=true
production:
enabled: false
development:
enabled: false
test:
enabled: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment