summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-02-03 09:21:37 -0500
committerJosh Frye <joshfng@gmail.com>2016-02-03 09:22:21 -0500
commit531767175f0a364a332c74bf27c5f202732ce519 (patch)
tree493a158205ed33fcbbc9fba843b15ac64d4b4bb0
parentc1faa836f6711695f2105e7405c2ea438382a5a8 (diff)
downloadgitlab-ce-remove-newrelic.tar.gz
Remove newrelic gem. Closes #12860remove-newrelic
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
-rw-r--r--config/newrelic.yml16
3 files changed, 0 insertions, 20 deletions
diff --git a/Gemfile b/Gemfile
index 16a02da5bf9..a8f3619782d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -303,8 +303,6 @@ group :production do
gem "gitlab_meta", '7.0'
end
-gem "newrelic_rpm", '~> 3.14'
-
gem 'octokit', '~> 3.8.0'
gem "mail_room", "~> 0.6.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 62937ab6fd2..6dd8b56fe7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -479,7 +479,6 @@ GEM
net-ldap (0.12.1)
net-ssh (3.0.1)
netrc (0.11.0)
- newrelic_rpm (3.14.1.311)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nprogress-rails (0.1.6.7)
@@ -960,7 +959,6 @@ DEPENDENCIES
mysql2 (~> 0.3.16)
nested_form (~> 0.3.2)
net-ssh (~> 3.0.1)
- newrelic_rpm (~> 3.14)
nokogiri (= 1.6.7.2)
nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0)
diff --git a/config/newrelic.yml b/config/newrelic.yml
deleted file mode 100644
index 9ef922a38d9..00000000000
--- a/config/newrelic.yml
+++ /dev/null
@@ -1,16 +0,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