diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-29 19:49:07 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-29 19:52:29 -0500 |
commit | d97742570fce0512eddb6dc6c924d541aa4f57e4 (patch) | |
tree | a36e3b79cd3439b4d4d6de11b9e204f85e4131df /spec/support | |
parent | dec21517186f7406da2efd76569b4dff4fa711e0 (diff) | |
download | gitlab-ce-d97742570fce0512eddb6dc6c924d541aa4f57e4.tar.gz |
Increase the minimum length for commit SHA matching to 7rs-issue-12706
This is the git default and will help to prevent false positive matches.
Closes #12706
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/filter_spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/filter_spec_helper.rb b/spec/support/filter_spec_helper.rb index d6e03cbef3d..ef5ea7d626e 100644 --- a/spec/support/filter_spec_helper.rb +++ b/spec/support/filter_spec_helper.rb @@ -67,9 +67,9 @@ module FilterSpecHelper if reference =~ /\A(.+)?.\d+\z/ # Integer-based reference with optional project prefix reference.gsub(/\d+\z/) { |i| i.to_i + 1 } - elsif reference =~ /\A(.+@)?(\h{6,40}\z)/ + elsif reference =~ /\A(.+@)?(\h{7,40}\z)/ # SHA-based reference with optional prefix - reference.gsub(/\h{6,40}\z/) { |v| v.reverse } + reference.gsub(/\h{7,40}\z/) { |v| v.reverse } else reference.gsub(/\w+\z/) { |v| v.reverse } end |