diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-20 13:14:20 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-20 15:11:30 +0300 |
commit | efa367fd1af3f9dc5027d2442a03b4c9505be276 (patch) | |
tree | 73b340367903b2ef3cb40471851960b410fe4d39 /lib | |
parent | 35ba46eef447f3ca9f6c5f0d1b12e3b1b058f6cd (diff) |
Merge branch '25848-fix-git-rev-list-env-parsing' into 'master'
Reject blank environment variables in Gitlab::Git::RevList
Closes #25848
See merge request !8189
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/rev_list.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/rev_list.rb b/lib/gitlab/git/rev_list.rb index 25e9d619697..79dd0cf7df2 100644 --- a/lib/gitlab/git/rev_list.rb +++ b/lib/gitlab/git/rev_list.rb @@ -22,7 +22,7 @@ module Gitlab def valid? environment_variables.all? do |(name, value)| - value.start_with?(project.repository.path_to_repo) + value.to_s.start_with?(project.repository.path_to_repo) end end @@ -35,7 +35,7 @@ module Gitlab end def environment_variables - @environment_variables ||= env.slice(*ALLOWED_VARIABLES) + @environment_variables ||= env.slice(*ALLOWED_VARIABLES).compact end end end |