diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:19:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:19:55 +0000 |
| commit | 19277271be890c1f836c38f2ccd5caa40c5765e2 (patch) | |
| tree | 15158531da24da77aee6a5d29001eff3795b2252 /lib/tasks/flay.rake | |
| parent | aea3569b4f39d98de87a93b7bf0c64e42cbcfeb0 (diff) | |
| parent | 9318f4ab2b6396782edb277aeddf45720d70b7e6 (diff) | |
| download | gitlab-ce-19277271be890c1f836c38f2ccd5caa40c5765e2.tar.gz | |
Merge branch 'zj-fix-flay' into 'master'
Fix flay not detecting identical code
Closes #42628
See merge request gitlab-org/gitlab-ce!16828
Diffstat (limited to 'lib/tasks/flay.rake')
| -rw-r--r-- | lib/tasks/flay.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/flay.rake b/lib/tasks/flay.rake index b1e012e70c5..4b4881cecb8 100644 --- a/lib/tasks/flay.rake +++ b/lib/tasks/flay.rake @@ -2,7 +2,7 @@ desc 'Code duplication analyze via flay' task :flay do output = `bundle exec flay --mass 35 app/ lib/gitlab/ 2> #{File::NULL}` - if output.include? "Similar code found" + if output.include?("Similar code found") || output.include?("IDENTICAL code found") puts output exit 1 end |