summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-16 13:26:06 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-04-16 13:26:06 +0000
commit5af7e8422bdff28fff3cde6cf31a0c6fde21918b (patch)
treec74a137f4bb9e9c5135445be1ee2e8812b78bdf4 /doc
parent86be4a6f466205b415de74330dd495a2e8b3c9d0 (diff)
parent579fa8b8ec7eb38d40c96521f517c9dab8c3b97a (diff)
downloadgitlab-ce-5af7e8422bdff28fff3cde6cf31a0c6fde21918b.tar.gz
Merge branch 'gt-fix-styling-for-pages-status' into 'master'
Fix styling for `app/assets/stylesheets/pages/status.scss` Closes #59929 See merge request gitlab-org/gitlab-ce!26875
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/mock_ci.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/integrations/mock_ci.md b/doc/user/project/integrations/mock_ci.md
index 8b1908c46fe..1c64b275d6e 100644
--- a/doc/user/project/integrations/mock_ci.md
+++ b/doc/user/project/integrations/mock_ci.md
@@ -5,7 +5,7 @@
To set up the mock CI service server, respond to the following endpoints
- `commit_status`: `#{project.namespace.path}/#{project.path}/status/#{sha}.json`
- - Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success_with_warnings'|'skipped'|'not_found'] }`
+ - Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success-with-warnings'|'skipped'|'not_found'] }`
- If the service returns a 404, it is interpreted as `pending`
- `build_page`: `#{project.namespace.path}/#{project.path}/status/#{sha}`
- Just where the build is linked to, doesn't matter if implemented