kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master'

Browse source 
[CE] Fix DiffCheck failing due to invalid string argument

See merge request gitlab-org/gitlab-ce!23741
This commit is contained in:
Stan Hu 2018-12-11 22:05:11 +00:00
commit c8aaf15cec
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/gitlab/checks/diff_check.rb
View file

@ -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?
@ -28,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?