diff options
author | Marcel Amirault <mamirault@gitlab.com> | 2019-08-12 12:54:30 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-12 12:54:30 +0300 |
commit | f6ff16eb988f82bde1fc2bf2882e2ea23abe1d76 (patch) | |
tree | f7357ab2a70860cdc4d1160df46d37abf13bb132 /doc/user/project/import | |
parent | 8e2666bf725ae582b20031cdb4345e3484a200d7 (diff) |
Fix markdown spacing in various docs
Align images and lists in assorted markdown docs
Diffstat (limited to 'doc/user/project/import')
-rw-r--r-- | doc/user/project/import/bitbucket.md | 6 | ||||
-rw-r--r-- | doc/user/project/import/bitbucket_server.md | 8 | ||||
-rw-r--r-- | doc/user/project/import/gemnasium.md | 42 | ||||
-rw-r--r-- | doc/user/project/import/manifest.md | 5 |
4 files changed, 32 insertions, 29 deletions
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md index 1cc3bd3363d..5abce39c093 100644 --- a/doc/user/project/import/bitbucket.md +++ b/doc/user/project/import/bitbucket.md @@ -49,17 +49,17 @@ namespace that started the import process. 1. Click on the "Bitbucket Cloud" button. - ![Bitbucket](img/import_projects_from_new_project_page.png) + ![Bitbucket](img/import_projects_from_new_project_page.png) 1. Grant GitLab access to your Bitbucket account - ![Grant access](img/bitbucket_import_grant_access.png) + ![Grant access](img/bitbucket_import_grant_access.png) 1. Click on the projects that you'd like to import or **Import all projects**. You can also select the namespace under which each project will be imported. - ![Import projects](img/bitbucket_import_select_project.png) + ![Import projects](img/bitbucket_import_select_project.png) [bb-import]: ../../../integration/bitbucket.md [social sign-in]: ../../profile/account/social_sign_in.md diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md index e4eb1a9a392..4e1614d82a5 100644 --- a/doc/user/project/import/bitbucket_server.md +++ b/doc/user/project/import/bitbucket_server.md @@ -59,16 +59,16 @@ namespace that started the import process. 1. Sign in to GitLab and go to your dashboard. 1. Click on **New project**. 1. Click on the "Bitbucket Server" button. If the button is not present, enable the importer in - **Admin > Application Settings > Visibility and access controls > Import sources**. + **Admin > Application Settings > Visibility and access controls > Import sources**. - ![Bitbucket](img/import_projects_from_new_project_page.png) + ![Bitbucket](img/import_projects_from_new_project_page.png) 1. Enter your Bitbucket Server credentials. - ![Grant access](img/bitbucket_server_import_credentials.png) + ![Grant access](img/bitbucket_server_import_credentials.png) 1. Click on the projects that you'd like to import or **Import all projects**. You can also select the namespace under which each project will be imported. - ![Import projects](img/bitbucket_server_import_select_project.png) + ![Import projects](img/bitbucket_server_import_select_project.png) diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md index 0afa32e4133..cf48189fa6e 100644 --- a/doc/user/project/import/gemnasium.md +++ b/doc/user/project/import/gemnasium.md @@ -5,13 +5,17 @@ instance or GitLab.com. ## Why is Gemnasium.com closed? -Gemnasium has been [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html) +Gemnasium was [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html) in January 2018. Since May 15, 2018, the services provided by Gemnasium are no longer available. The team behind Gemnasium has joined GitLab as the new Security Products team -and is working on a wider range of tools than just Dependency Scanning: -[SAST](../../application_security/sast/index.md), -[DAST](../../application_security/dast/index.md), -[Container Scanning](../../application_security/container_scanning/index.md) and more. +and is working on a [wide range of tools](../../application_security/index.md), +including: + +- [Dependency Scanning](../../application_security/dependency_scanning/index.md) +- [SAST](../../application_security/sast/index.md) +- [DAST](../../application_security/dast/index.md) +- [Container Scanning](../../application_security/container_scanning/index.md) + If you want to continue monitoring your dependencies, see the [Migrating to GitLab](#migrating-to-gitlab) section below. @@ -57,27 +61,27 @@ back to both GitLab and GitHub when completed. 1. Create a new project, and select the "CI/CD for external repo" tab: - ![Create new Project](img/gemnasium/create_project.png) + ![Create new Project](img/gemnasium/create_project.png) 1. Use the "GitHub" button to connect your repositories. - ![Connect from GitHub](img/gemnasium/connect_github.png) + ![Connect from GitHub](img/gemnasium/connect_github.png) 1. Select the project(s) to be set up with GitLab CI/CD and chose "Connect". - ![Select projects](img/gemnasium/select_project.png) + ![Select projects](img/gemnasium/select_project.png) - Once the configuration is done, you may click on your new - project on GitLab. + Once the configuration is done, you may click on your new + project on GitLab. - ![click on connected project](img/gemnasium/project_connected.png) + ![click on connected project](img/gemnasium/project_connected.png) - Your project is now mirrored on GitLab, where the Runners will be able to access - your source code and run your tests. + Your project is now mirrored on GitLab, where the Runners will be able to access + your source code and run your tests. - Optional step: If you set this up on GitLab.com, make sure the project is - public (in the project settings) if your GitHub project is public, since - the security feature is available only for [GitLab Ultimate](https://about.gitlab.com/pricing). + Optional step: If you set this up on GitLab.com, make sure the project is + public (in the project settings) if your GitHub project is public, since + the security feature is available only for [GitLab Ultimate](https://about.gitlab.com/pricing). 1. To set up the dependency scanning job, corresponding to what Gemnasium was doing, you must create a `.gitlab-ci.yml` file, or update it according to @@ -85,16 +89,16 @@ back to both GitLab and GitHub when completed. The mirroring is pull-only by default, so you may create or update the file on GitHub: - ![Edit gitlab-ci.yml file](img/gemnasium/edit_gitlab-ci.png) + ![Edit gitlab-ci.yml file](img/gemnasium/edit_gitlab-ci.png) 1. Once your file has been committed, a new pipeline will be automatically triggered if your file is valid: - ![pipeline](img/gemnasium/pipeline.png) + ![pipeline](img/gemnasium/pipeline.png) 1. The result of the job will be visible directly from the pipeline view: - ![security report](img/gemnasium/report.png) + ![security report](img/gemnasium/report.png) NOTE: **Note:** If you don't commit very often to your project, you may want to use diff --git a/doc/user/project/import/manifest.md b/doc/user/project/import/manifest.md index baf410d9c9e..161a4163e42 100644 --- a/doc/user/project/import/manifest.md +++ b/doc/user/project/import/manifest.md @@ -1,7 +1,6 @@ # Import multiple repositories by uploading a manifest file -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in -GitLab 11.2. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in GitLab 11.2. GitLab allows you to import all the required Git repositories based on a manifest file like the one used by the @@ -56,4 +55,4 @@ You can start the import with: to the import status page with projects list based on the manifest file. 1. Check the list and click **Import all repositories** to start the import. - ![Manifest status](img/manifest_status.png) + ![Manifest status](img/manifest_status.png) |