diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 10:42:51 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 10:42:51 -0500 |
| commit | 0104ab79b3b6c6d532098bb98dc48f724633310f (patch) | |
| tree | 0991dcdca14bcf48534f43753bdddd916a454b79 /Gemfile.lock | |
| parent | af978cd5bcf54bece70a8bf2634172bb8133cc67 (diff) | |
| parent | fe6f17ceda53c83151cb1694568063db883589ee (diff) | |
| download | gitlab-ce-0104ab79b3b6c6d532098bb98dc48f724633310f.tar.gz | |
Merge branch 'master' into avatar-cropping
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 41400ff9825..bd220146bf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -480,6 +480,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) @@ -962,6 +963,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) |