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 09:23:30 +0100 |
commit | 25b7a1ce8151fd3d482ec55afc0c21e44c8915eb (patch) | |
tree | 621b0001deb19bad2343db85b7a66cc52eccbb84 | |
parent | 85f3dabefa1231ee22a422ea296b5a41128bcaaf (diff) | |
download | gitlab-ce-25b7a1ce8151fd3d482ec55afc0c21e44c8915eb.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-- | CHANGELOG | 1 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | config/newrelic.yml | 16 |
4 files changed, 21 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index cc81aceef97..f64416af40f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.5.1 - Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec) - Restrict permissions on public/uploads - 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 v 8.5.0 @@ -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 2614d5047ba..978c2659d99 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 |