diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 00:06:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 00:06:28 +0000 |
commit | 9615736987b94a783845354ba881008e49d39238 (patch) | |
tree | 0620a1d06e44df92fa936b7a86e57d282f690181 /doc | |
parent | eb7390edf3afd52174b786fff1e06d5ffae0cec5 (diff) | |
download | gitlab-ce-9615736987b94a783845354ba881008e49d39238.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/build_test_package.md | 6 | ||||
-rw-r--r-- | doc/development/img/build_package_v12_6.png | bin | 0 -> 124510 bytes | |||
-rw-r--r-- | doc/development/img/trigger_build_package_v12_6.png | bin | 0 -> 141603 bytes | |||
-rw-r--r-- | doc/development/img/trigger_ss1.png | bin | 35756 -> 0 bytes | |||
-rw-r--r-- | doc/development/img/trigger_ss2.png | bin | 36082 -> 0 bytes |
5 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/build_test_package.md b/doc/development/build_test_package.md index f58ac79b6f4..d478d6e1653 100644 --- a/doc/development/build_test_package.md +++ b/doc/development/build_test_package.md @@ -9,16 +9,16 @@ that will create: - A deb package for Ubuntu 16.04, available as a build artifact, and - A docker image, which is pushed to [Omnibus GitLab's container registry](https://gitlab.com/gitlab-org/omnibus-gitlab/container_registry) - (images titled `gitlab-foss` and `gitlab-ee` respectively and image tag is the + (images titled `gitlab-ce` and `gitlab-ee` respectively and image tag is the commit which triggered the pipeline). When you push a commit to either the GitLab CE or GitLab EE project, the pipeline for that commit will have a `build-package` manual action you can trigger. -![Manual actions](img/trigger_ss1.png) +![Manual actions](img/build_package_v12_6.png) -![Build package manual action](img/trigger_ss2.png) +![Build package manual action](img/trigger_build_package_v12_6.png) ## Specifying versions of components diff --git a/doc/development/img/build_package_v12_6.png b/doc/development/img/build_package_v12_6.png Binary files differnew file mode 100644 index 00000000000..c3d99e6c6ce --- /dev/null +++ b/doc/development/img/build_package_v12_6.png diff --git a/doc/development/img/trigger_build_package_v12_6.png b/doc/development/img/trigger_build_package_v12_6.png Binary files differnew file mode 100644 index 00000000000..6f5879bd8c4 --- /dev/null +++ b/doc/development/img/trigger_build_package_v12_6.png diff --git a/doc/development/img/trigger_ss1.png b/doc/development/img/trigger_ss1.png Binary files differdeleted file mode 100644 index addbc551f73..00000000000 --- a/doc/development/img/trigger_ss1.png +++ /dev/null diff --git a/doc/development/img/trigger_ss2.png b/doc/development/img/trigger_ss2.png Binary files differdeleted file mode 100644 index 02ef3810a59..00000000000 --- a/doc/development/img/trigger_ss2.png +++ /dev/null |