summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-24 10:47:22 +0000
committerValery Sizov <valery@gitlab.com>2015-06-24 10:47:22 +0000
commit592f66868ad1e661cef394bb9f9bae2432f1cad4 (patch)
tree0881b7649e0e960ea93f3b87f2e923d46225b003
parent95427ba88a14c772c82389fecf82f1563fc412ef (diff)
parentd5bb81c1a5a6266024e04f2bcc9a93c7a2b66434 (diff)
downloadgitlab-ci-592f66868ad1e661cef394bb9f9bae2432f1cad4.tar.gz
Merge branch 'webhook_update' into 'master'
Update webhook example https://dev.gitlab.org/gitlab/gitlab-ci/issues/297 https://gitlab.com/gitlab-org/gitlab-ci/issues/181 See merge request !162
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/web_hooks/index.html.haml4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0f9e9e8..2a8cbf3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
v7.13.0
- Fix: No runner notification can see managers only
- Fix: lint with relative subpath
+ - Update web hook example
v7.12.1
- Runner without tag should pick builds without tag only
diff --git a/app/views/web_hooks/index.html.haml b/app/views/web_hooks/index.html.haml
index 731afbd..0c7db4b 100644
--- a/app/views/web_hooks/index.html.haml
+++ b/app/views/web_hooks/index.html.haml
@@ -39,6 +39,7 @@
<code>
{
"build_id": 2,
+ "build_name":"rspec_linux"
"build_status": "failed",
"build_started_at": "2014-05-05T18:01:02.563Z",
"build_finished_at": "2014-05-05T18:01:07.611Z",
@@ -83,7 +84,8 @@
}
}
],
- "total_commits_count": 2
+ "total_commits_count": 2,
+ "ci_yaml_file":"rspec_linux:\r\n script: ls\r\n"
}
}
</code>