diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-16 15:41:36 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-16 15:41:36 +0000 |
commit | 500a1a7bc30866b957de3ff975a60758dea8338f (patch) | |
tree | f4d37b14ce53d26003afab0654f1cc2532c1a971 /Gemfile.lock | |
parent | 71e055444942e93ad028f50896fe680cdf2caf5d (diff) | |
parent | 66ae1bde872bd828e9de660cd45007363000c986 (diff) | |
download | gitlab-ce-500a1a7bc30866b957de3ff975a60758dea8338f.tar.gz |
Merge branch 'new_relic' into 'master'
Add dormant New Relic gem
See merge request !1089
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e6d948e9a07..e9be030a8fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,6 +296,7 @@ GEM net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.8.0) + newrelic_rpm (3.9.4.245) nokogiri (1.6.2.1) mini_portile (= 0.6.0) nprogress-rails (0.1.2.3) @@ -641,6 +642,7 @@ DEPENDENCIES minitest (~> 5.3.0) mousetrap-rails mysql2 + newrelic_rpm nprogress-rails omniauth (~> 1.1.3) omniauth-github |