summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 10:29:43 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 10:29:43 +0200
commit0b4981e77187d99737f42b0a2c1c27c14f75d92e (patch)
treed4f5cfcc08d0e6794b34fe67358dbba3a9b1b300 /.gitlab-ci.yml
parentaebfdcd8513b5513f8631f7e67d7f2900f093278 (diff)
parent9e256de4ac33e284ceb88c6af410f87c5f51228d (diff)
downloadgitlab-ce-0b4981e77187d99737f42b0a2c1c27c14f75d92e.tar.gz
Merge remote-tracking branch 'origin/master' into knapsack
# Conflicts: # .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bece719b00..172fbaf52b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,6 +170,7 @@ rake brakeman: *exec
rake flog: *exec
rake flay: *exec
rake db:migrate:reset: *exec
+license-finder: *exec
bundler:audit:
stage: test