diff options
| author | 🙈 jacopo beschi 🙉 <intrip@gmail.com> | 2018-01-11 16:34:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-11 16:34:01 +0000 |
| commit | 729f05f0e3c4835c91e20ccd1ddb630eb7ef4379 (patch) | |
| tree | 3d543c84930ce20b7c91d48295bf3e106c788cde /lib/gitlab/ee_compat_check.rb | |
| parent | ca8394e8e4931c85b5f2a2bde1951bcb9419e220 (diff) | |
| download | gitlab-ce-729f05f0e3c4835c91e20ccd1ddb630eb7ef4379.tar.gz | |
Adds Rubocop rule for line break around conditionals
Diffstat (limited to 'lib/gitlab/ee_compat_check.rb')
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 37face8e7d0..d3b49b1ec75 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -156,12 +156,14 @@ module Gitlab %W[git apply --3way #{patch_path}] ) do |output, status| puts output + unless status.zero? @failed_files = output.lines.reduce([]) do |memo, line| if line.start_with?('error: patch failed:') file = line.sub(/\Aerror: patch failed: /, '') memo << file unless file =~ IGNORED_FILES_REGEX end + memo end |