summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-04-05 12:11:14 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-04-05 12:11:14 +0000
commitf9607db7a4db87b07ed2f2634794f99084a6534d (patch)
tree4bdfb108223691c8414d7c59dafe89bca0171837
parent57ec7c618ebf4f32d8c38237e7ee120f3880df7a (diff)
parent1c609123705045e83a0f388472a565cc85a2c6ed (diff)
downloadgitlab-ce-f9607db7a4db87b07ed2f2634794f99084a6534d.tar.gz
Merge branch 'jacoco' into 'master'
JaCoCo example See merge request gitlab-org/gitlab-ce!17969
-rw-r--r--app/views/projects/pipelines_settings/_show.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml
index 646c01c0989..63a1f25bfec 100644
--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -151,6 +151,9 @@
%li
excoveralls (Elixir) -
%code \[TOTAL\]\s+(\d+\.\d+)%
+ %li
+ JaCoCo (Java/Kotlin)
+ %code Total.*?([0-9]{1,3})%
= f.submit 'Save changes', class: "btn btn-save"