diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-01 18:23:36 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-01 18:23:36 +0000 |
| commit | 9ba8685ea701a2f805d4bf6fb71ff52c49065c92 (patch) | |
| tree | 13daac9aae82d3f733dd4ce46f3a28a806b27982 /scripts/static-analysis | |
| parent | c4e7875d2909588e55c21a7cf19e31f60bce200f (diff) | |
| parent | 0edf2b0d421144686ee399f44c26a2c4e1b2df05 (diff) | |
| download | gitlab-ce-docs-specific-review-examples.tar.gz | |
Merge branch 'master' into 'docs-specific-review-examples'docs-specific-review-examples
# Conflicts:
# doc/development/code_review.md
Diffstat (limited to 'scripts/static-analysis')
| -rwxr-xr-x | scripts/static-analysis | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/static-analysis b/scripts/static-analysis index 6d35684b97f..e4f80e8fc6f 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -11,7 +11,8 @@ tasks = [ %w[bundle exec rake brakeman], %w[bundle exec license_finder], %w[yarn run eslint], - %w[bundle exec rubocop --require rubocop-rspec] + %w[bundle exec rubocop --require rubocop-rspec], + %w[scripts/lint-conflicts.sh] ] failed_tasks = tasks.reduce({}) do |failures, task| |