summaryrefslogtreecommitdiff
path: root/Gemfile
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 /Gemfile
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 2 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"