Merge branch 'jacoco' into 'master'

JaCoCo example See merge request gitlab-org/gitlab-ce!17969

Merge branch 'jacoco' into 'master'
JaCoCo example See merge request gitlab-org/gitlab-ce!17969
f9607db7 · Kamil Trzciński · 57ec7c61 · 1c609123 · f9607db7
Commit f9607db7 authored Apr 05, 2018 by Kamil Trzciński
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app/views/projects/pipelines_settings/_show.html.haml app/views/projects/pipelines_settings/_show.html.haml +3 -0

No files found.
--- 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"