Merge branch '13748-cli-options' into 'master'v1.8.0

Add LICENSE_FINDER_CLI_OPTS variable

See merge request gitlab-org/security-products/license-management!77

2 files changed, 15 insertions, 1 deletions

diff --git a/lib/license/management.rb b/lib/license/management.rb
index 64fd4e8..a6e0664 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -12,6 +12,20 @@ require 'license/management/version'
 # This applies a monkey patch to the JsonReport found in the `license_finder` gem.
 LicenseFinder::JsonReport.prepend(License::Management::Report)
 
+# This monkey patch can be removed once we upgrade to license_finder 5.9.2. Details [here](https://gitlab.com/gitlab-org/gitlab/issues/13748#note_235810786).
+module LicenseFinder
+  class Bundler < PackageManager
+    def definition
+      @definition ||=
+        begin
+          Dir.chdir(project_path.to_s) do
+            ::Bundler::Definition.build(detected_package_path, lockfile_path, nil)
+          end
+        end
+    end
+  end
+end
+
 module License
   module Management
     def self.root
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 8161098..f42933e 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '1.7.4'
+    VERSION = '1.8.0'
   end
 end