diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-08-01 12:06:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-01 12:06:56 +0000 |
| commit | 913aca1db9b1bbf90f3490262c4429d95fbc517c (patch) | |
| tree | 918d1cb291552aaf4b98a50eb65bcb7a37ff422a /scripts/static-analysis | |
| parent | 0bbf006454e47cb0411a0d035e45cda39739ca6f (diff) | |
| download | gitlab-ce-913aca1db9b1bbf90f3490262c4429d95fbc517c.tar.gz | |
Make sure we didn't commit conflicts
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| |