From eb335bbcfe50e46edb142564824a5d45fbb72e9c Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 10 Dec 2018 14:11:56 -0800 Subject: Fix DiffCheck failing due to invalid string argument Hot patch for #55137 --- lib/gitlab/checks/diff_check.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/gitlab/checks/diff_check.rb b/lib/gitlab/checks/diff_check.rb index 49d361fcef7..b8697b4a02d 100644 --- a/lib/gitlab/checks/diff_check.rb +++ b/lib/gitlab/checks/diff_check.rb @@ -11,6 +11,7 @@ module Gitlab }.freeze def validate! + return if deletion? || newrev.nil? return unless should_run_diff_validations? return if commits.empty? return unless uses_raw_delta_validations? -- cgit v1.2.1 From 1e4b6cd8e6857555bd3635ba9bd9dce937676cd2 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 11 Dec 2018 17:17:10 +0100 Subject: Remove now-unnecessary checks --- lib/gitlab/checks/diff_check.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/gitlab/checks/diff_check.rb b/lib/gitlab/checks/diff_check.rb index b8697b4a02d..8ee345ab45a 100644 --- a/lib/gitlab/checks/diff_check.rb +++ b/lib/gitlab/checks/diff_check.rb @@ -29,7 +29,7 @@ module Gitlab private def should_run_diff_validations? - newrev && oldrev && !deletion? && validate_lfs_file_locks? + validate_lfs_file_locks? end def validate_lfs_file_locks? -- cgit v1.2.1