summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-24 07:25:36 +0000
committerRémy Coutable <remy@rymai.me>2016-02-24 07:25:36 +0000
commitbd71438d6accb61a33b520177aeb92a3614eedb5 (patch)
tree8bdcba2d7ec820fb8dd73f31f4853b161ced9479
parentdba47f680d1716a0e5d96809522301ed3400e396 (diff)
parent623cd239036694cda87de4851b57b118e9c76e22 (diff)
downloadgitlab-ce-bd71438d6accb61a33b520177aeb92a3614eedb5.tar.gz
Merge branch 'bring-back-newrelic-gem' into 'master'
Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
-rw-r--r--config/newrelic.yml16
3 files changed, 20 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 41abb17f050..00457dd39d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -303,6 +303,8 @@ 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 e2e290b3dc2..7a1b94cff6c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -479,6 +479,7 @@ 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,6 +961,7 @@ DEPENDENCIES
nested_form (~> 0.3.2)
net-ssh (~> 3.0.1)
nokogiri (~> 1.6.7, >= 1.6.7.2)
+ newrelic_rpm (~> 3.14)
nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0)
octokit (~> 3.8.0)
diff --git a/config/newrelic.yml b/config/newrelic.yml
new file mode 100644
index 00000000000..9ef922a38d9
--- /dev/null
+++ b/config/newrelic.yml
@@ -0,0 +1,16 @@
+# 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