summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-08-07 12:51:11 +0000
committerCan Eldem <celdem@gitlab.com>2020-08-07 12:51:11 +0000
commit71e548e24191f9afe53f5679906d464b24c5c985 (patch)
treef738829459a032079cf3afab3cc6cde895812c7c /lib
parentdae67cdc5db97d87b90b76b3283b674edc052e16 (diff)
parenta89906bb5f31fd2cbc7762aaaa8f4d9955568c48 (diff)
Merge branch '217904-deb-docker' into 'master'v3.20.1
Package license management deb from deb job See merge request gitlab-org/security-products/license-management!203
Diffstat (limited to 'lib')
-rw-r--r--lib/license/finder/ext/bundler.rb1
-rw-r--r--lib/license/management.rb2
-rw-r--r--lib/license/management/version.rb2
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/license/finder/ext/bundler.rb b/lib/license/finder/ext/bundler.rb
index 7d3fe30..0530f32 100644
--- a/lib/license/finder/ext/bundler.rb
+++ b/lib/license/finder/ext/bundler.rb
@@ -83,7 +83,6 @@ module LicenseFinder
Dir.chdir(project_path) do
::Gem.clear_paths
::Bundler.reset!
- ::Bundler.configure
if ::Bundler.respond_to?(:with_unbundled_env)
::Bundler.with_unbundled_env { yield }
else
diff --git a/lib/license/management.rb b/lib/license/management.rb
index 0824157..41885d5 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -26,7 +26,7 @@ module License
def self.logger
@logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN)).tap do |x|
x.formatter = proc do |_severity, _datetime, _progname, message|
- prefix = message.start_with?("\n") ? "" : "[v#{VERSION}] "
+ prefix = message.to_s.start_with?("\n") ? "" : "[v#{VERSION}] "
"#{prefix}#{message}\n"
end
end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index ac8abbd..9e5f556 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.20.0'
+ VERSION = '3.20.1'
end
end