Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: newrelic/rpm
base: master
...
head fork: hashrocket/rpm
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 2 commit comments
  • 1 contributor
Commits on Jun 03, 2011
John Thomas Marino and Paul Elliott Prevent activation when only ActiveShipping is included
Currently the ActiveMerchant instrumentation activates when
ActiveShipping is included in the project because they share the
ActiveMerchant namespace. Adding a check for ActiveMerchant::Billing
prevents the exception from occurring.
a388e75
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/new_relic/agent/instrumentation/active_merchant.rb
View
2  lib/new_relic/agent/instrumentation/active_merchant.rb
@@ -1,6 +1,6 @@
DependencyDetection.defer do
depends_on do
- defined?(ActiveMerchant)
+ defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing)
end
executes do

Showing you all comments on commits in this comparison.

@bkayser
Owner

Pulled in to 3.2.0. Sorry for the delay. Thanks for the contrib!

@jennwang
Something went wrong with that request. Please try again.