From 32a3c3e068e957716eac56a755f44268c07c5957 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 10 Nov 2015 03:26:51 +0200 Subject: [PATCH] Place images in their own dir --- doc/ci/{quick_start => }/enable_ci.md | 10 +++++----- doc/ci/{quick_start => img}/builds_tab.png | Bin .../ci_service_disabled.png | Bin .../{quick_start => img}/ci_service_enabled.png | Bin .../ci_service_mark_active.png | Bin doc/ci/quick_start/README.md | 16 +++++++--------- doc/ci/quick_start/{ => img}/build_status.png | Bin doc/ci/quick_start/{ => img}/commit_status.png | Bin doc/ci/quick_start/{ => img}/new_commit.png | Bin doc/ci/quick_start/{ => img}/projects.png | Bin doc/ci/quick_start/{ => img}/runners.png | Bin .../quick_start/{ => img}/runners_activated.png | Bin 12 files changed, 12 insertions(+), 14 deletions(-) rename doc/ci/{quick_start => }/enable_ci.md (80%) rename doc/ci/{quick_start => img}/builds_tab.png (100%) rename doc/ci/{quick_start => img}/ci_service_disabled.png (100%) rename doc/ci/{quick_start => img}/ci_service_enabled.png (100%) rename doc/ci/{quick_start => img}/ci_service_mark_active.png (100%) rename doc/ci/quick_start/{ => img}/build_status.png (100%) rename doc/ci/quick_start/{ => img}/commit_status.png (100%) rename doc/ci/quick_start/{ => img}/new_commit.png (100%) rename doc/ci/quick_start/{ => img}/projects.png (100%) rename doc/ci/quick_start/{ => img}/runners.png (100%) rename doc/ci/quick_start/{ => img}/runners_activated.png (100%) diff --git a/doc/ci/quick_start/enable_ci.md b/doc/ci/enable_ci.md similarity index 80% rename from doc/ci/quick_start/enable_ci.md rename to 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 similarity index 100% rename from doc/ci/quick_start/builds_tab.png rename to doc/ci/img/builds_tab.png diff --git a/doc/ci/quick_start/ci_service_disabled.png b/doc/ci/img/ci_service_disabled.png similarity index 100% rename from doc/ci/quick_start/ci_service_disabled.png rename to doc/ci/img/ci_service_disabled.png diff --git a/doc/ci/quick_start/ci_service_enabled.png b/doc/ci/img/ci_service_enabled.png similarity index 100% rename from doc/ci/quick_start/ci_service_enabled.png rename to doc/ci/img/ci_service_enabled.png diff --git a/doc/ci/quick_start/ci_service_mark_active.png b/doc/ci/img/ci_service_mark_active.png similarity index 100% rename from doc/ci/quick_start/ci_service_mark_active.png rename to doc/ci/img/ci_service_mark_active.png 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,23 +16,21 @@ 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. - -Read [how to enable the GitLab CI service](enable_ci.md). - ## 1. Creating a `.gitlab-ci.yml` file **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. +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. + For other methods read [how to enable the GitLab CI service](../enable_ci.md). ### What is `.gitlab-ci.yml` diff --git a/doc/ci/quick_start/build_status.png b/doc/ci/quick_start/img/build_status.png similarity index 100% rename from doc/ci/quick_start/build_status.png rename to doc/ci/quick_start/img/build_status.png diff --git a/doc/ci/quick_start/commit_status.png b/doc/ci/quick_start/img/commit_status.png similarity index 100% rename from doc/ci/quick_start/commit_status.png rename to doc/ci/quick_start/img/commit_status.png diff --git a/doc/ci/quick_start/new_commit.png b/doc/ci/quick_start/img/new_commit.png similarity index 100% rename from doc/ci/quick_start/new_commit.png rename to doc/ci/quick_start/img/new_commit.png diff --git a/doc/ci/quick_start/projects.png b/doc/ci/quick_start/img/projects.png similarity index 100% rename from doc/ci/quick_start/projects.png rename to doc/ci/quick_start/img/projects.png diff --git a/doc/ci/quick_start/runners.png b/doc/ci/quick_start/img/runners.png similarity index 100% rename from doc/ci/quick_start/runners.png rename to doc/ci/quick_start/img/runners.png diff --git a/doc/ci/quick_start/runners_activated.png b/doc/ci/quick_start/img/runners_activated.png similarity index 100% rename from doc/ci/quick_start/runners_activated.png rename to doc/ci/quick_start/img/runners_activated.png