Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-11-10 04:26:51 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-12-01 10:00:34 +0300
commit32a3c3e068e957716eac56a755f44268c07c5957 (patch)
tree01627e8ffd7b5cc6c3d8f5cb09412412fba701d8 /doc/ci
parent3b4806bad95e55a40d3efe02e329d271995d8a70 (diff)
Place images in their own dir
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/enable_ci.md (renamed from doc/ci/quick_start/enable_ci.md)10
-rw-r--r--doc/ci/img/builds_tab.png (renamed from doc/ci/quick_start/builds_tab.png)bin3845 -> 3845 bytes
-rw-r--r--doc/ci/img/ci_service_disabled.png (renamed from doc/ci/quick_start/ci_service_disabled.png)bin3598 -> 3598 bytes
-rw-r--r--doc/ci/img/ci_service_enabled.png (renamed from doc/ci/quick_start/ci_service_enabled.png)bin3545 -> 3545 bytes
-rw-r--r--doc/ci/img/ci_service_mark_active.png (renamed from doc/ci/quick_start/ci_service_mark_active.png)bin17193 -> 17193 bytes
-rw-r--r--doc/ci/quick_start/README.md14
-rw-r--r--doc/ci/quick_start/img/build_status.png (renamed from doc/ci/quick_start/build_status.png)bin62140 -> 62140 bytes
-rw-r--r--doc/ci/quick_start/img/commit_status.png (renamed from doc/ci/quick_start/commit_status.png)bin33492 -> 33492 bytes
-rw-r--r--doc/ci/quick_start/img/new_commit.png (renamed from doc/ci/quick_start/new_commit.png)bin47527 -> 47527 bytes
-rw-r--r--doc/ci/quick_start/img/projects.png (renamed from doc/ci/quick_start/projects.png)bin37014 -> 37014 bytes
-rw-r--r--doc/ci/quick_start/img/runners.png (renamed from doc/ci/quick_start/runners.png)bin123048 -> 123048 bytes
-rw-r--r--doc/ci/quick_start/img/runners_activated.png (renamed from doc/ci/quick_start/runners_activated.png)bin60769 -> 60769 bytes
12 files changed, 11 insertions, 13 deletions
diff --git a/doc/ci/quick_start/enable_ci.md b/doc/ci/enable_ci.md
index 42635e35d5d..01c684dabec 100644
--- a/doc/ci/quick_start/enable_ci.md
+++ b/doc/ci/enable_ci.md
@@ -7,14 +7,14 @@ First, head over your project's page that you would like to enable GitLab CI
for. If you can see the **Builds** tab in the sidebar, then GitLab CI is
already enabled and you can skip reading the rest of this guide.
-![Builds tab](builds_tab.png)
+![Builds tab](img/builds_tab.png)
If not, there are two ways to enable it in your project.
## Use .gitlab-ci.yml to enable GitLab CI
GitLab CI will be automatically enabled if you just push a
-[`.gitlab-ci.yml`](../yaml/README.md) in your git repository. GitLab will
+[`.gitlab-ci.yml`](yaml/README.md) in your git repository. GitLab will
pick up the change immediately and GitLab CI will be enabled for this project.
This is the recommended way.
@@ -26,14 +26,14 @@ and this is also the way to disable it if needed.
Go to **Settings > Services** and search for **GitLab CI**. Its state should
be disabled.
-![CI service disabled](ci_service_disabled.png)
+![CI service disabled](img/ci_service_disabled.png)
Click on **GitLab CI** to enter its settings, mark it as active and hit
**Save**.
-![Mark CI service as active](ci_service_mark_active.png)
+![Mark CI service as active](img/ci_service_mark_active.png)
Do you see that green dot? Then good, the service is now enabled! You can also
check its status under **Services**.
-![CI service enabled](ci_service_enabled.png)
+![CI service enabled](img/ci_service_enabled.png)
diff --git a/doc/ci/quick_start/builds_tab.png b/doc/ci/img/builds_tab.png
index d088b8b329d..d088b8b329d 100644
--- a/doc/ci/quick_start/builds_tab.png
+++ b/doc/ci/img/builds_tab.png
Binary files differ
diff --git a/doc/ci/quick_start/ci_service_disabled.png b/doc/ci/img/ci_service_disabled.png
index 351de4267a4..351de4267a4 100644
--- a/doc/ci/quick_start/ci_service_disabled.png
+++ b/doc/ci/img/ci_service_disabled.png
Binary files differ
diff --git a/doc/ci/quick_start/ci_service_enabled.png b/doc/ci/img/ci_service_enabled.png
index dfe7488c1ba..dfe7488c1ba 100644
--- a/doc/ci/quick_start/ci_service_enabled.png
+++ b/doc/ci/img/ci_service_enabled.png
Binary files differ
diff --git a/doc/ci/quick_start/ci_service_mark_active.png b/doc/ci/img/ci_service_mark_active.png
index 8bc8694cec3..8bc8694cec3 100644
--- a/doc/ci/quick_start/ci_service_mark_active.png
+++ b/doc/ci/img/ci_service_mark_active.png
Binary files differ
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index d45ad3e5e23..ce05a6f417c 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -16,19 +16,17 @@ In brief, the steps needed to have a working CI can be summed up to:
1. Configure a Runner
From there on, on every push to your git repository the build will be
-automagically started by the runner and will appear under the project's `/builds`
-page.
+automagically started by the runner and will appear under the project's
+`/builds` page.
Now, let's break it down to pieces and work on solving the GitLab CI puzzle.
-## 1. Enable GitLab CI
-
-After creating a new project, the first thing to do is enable the **GitLab CI**
-service in your project's settings if it isn't already enabled.
+## 1. Creating a `.gitlab-ci.yml` file
-Read [how to enable the GitLab CI service](enable_ci.md).
+ **GitLab CI** service is enabled automatically on the first push of a
+ `.gitlab-ci.yml` file in your repository and this is the recommended way.
-## 1. Creating a `.gitlab-ci.yml` file
+For other methods read [how to enable the GitLab CI service](../enable_ci.md).
**GitLab CI** service is enabled automatically on the first push of a
`.gitlab-ci.yml` file in your repository and this is the recommended way.
diff --git a/doc/ci/quick_start/build_status.png b/doc/ci/quick_start/img/build_status.png
index 333259e6acd..333259e6acd 100644
--- a/doc/ci/quick_start/build_status.png
+++ b/doc/ci/quick_start/img/build_status.png
Binary files differ
diff --git a/doc/ci/quick_start/commit_status.png b/doc/ci/quick_start/img/commit_status.png
index 725b79e6f91..725b79e6f91 100644
--- a/doc/ci/quick_start/commit_status.png
+++ b/doc/ci/quick_start/img/commit_status.png
Binary files differ
diff --git a/doc/ci/quick_start/new_commit.png b/doc/ci/quick_start/img/new_commit.png
index 3839e893c17..3839e893c17 100644
--- a/doc/ci/quick_start/new_commit.png
+++ b/doc/ci/quick_start/img/new_commit.png
Binary files differ
diff --git a/doc/ci/quick_start/projects.png b/doc/ci/quick_start/img/projects.png
index 0b3430a69db..0b3430a69db 100644
--- a/doc/ci/quick_start/projects.png
+++ b/doc/ci/quick_start/img/projects.png
Binary files differ
diff --git a/doc/ci/quick_start/runners.png b/doc/ci/quick_start/img/runners.png
index 25b4046bc00..25b4046bc00 100644
--- a/doc/ci/quick_start/runners.png
+++ b/doc/ci/quick_start/img/runners.png
Binary files differ
diff --git a/doc/ci/quick_start/runners_activated.png b/doc/ci/quick_start/img/runners_activated.png
index c934bd12f41..c934bd12f41 100644
--- a/doc/ci/quick_start/runners_activated.png
+++ b/doc/ci/quick_start/img/runners_activated.png
Binary files differ