diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-24 07:25:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-24 07:25:36 +0000 |
| commit | bd71438d6accb61a33b520177aeb92a3614eedb5 (patch) | |
| tree | 8bdcba2d7ec820fb8dd73f31f4853b161ced9479 /config | |
| parent | dba47f680d1716a0e5d96809522301ed3400e396 (diff) | |
| parent | 623cd239036694cda87de4851b57b118e9c76e22 (diff) | |
| download | gitlab-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
Diffstat (limited to 'config')
| -rw-r--r-- | config/newrelic.yml | 16 |
1 files changed, 16 insertions, 0 deletions
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 |