diff options
| author | Evan Read <eread@gitlab.com> | 2019-07-01 14:04:10 +1000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-02 07:19:36 +1000 |
| commit | a615af951a79385bf3abcd2138ab006573bb49c2 (patch) | |
| tree | 7658a7d752a7962a88e16925809eb18212df0f7d | |
| parent | 96fc5f3e2315173812bba82b2d2af4f1e0c01d63 (diff) | |
| download | gitlab-ce-a615af951a79385bf3abcd2138ab006573bb49c2.tar.gz | |
Review feedback implementeddocs/fix-bare-urls-in-projects
| -rw-r--r-- | doc/integration/elasticsearch.md | 2 | ||||
| -rw-r--r-- | doc/user/project/import/gemnasium.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md index b3351733b92..f64fdb1e28b 100644 --- a/doc/integration/elasticsearch.md +++ b/doc/integration/elasticsearch.md @@ -156,7 +156,7 @@ If no namespaces or projects are selected, no Elasticsearch indexing will take p CAUTION: **Warning**: If you have already indexed your instance, you will have to regenerate the index in order to delete all existing data for filtering to work correctly. To do this run the rake tasks `gitlab:elastic:create_empty_index` and -`gitlab:elastic:clear_index_status` Afterwards, removing a namespace or a project from the list will delete the data +`gitlab:elastic:clear_index_status`. Afterwards, removing a namespace or a project from the list will delete the data from the Elasticsearch index as expected. ## Disabling Elasticsearch diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md index 61801f14bbd..3b071ff590f 100644 --- a/doc/user/project/import/gemnasium.md +++ b/doc/user/project/import/gemnasium.md @@ -40,14 +40,14 @@ some steps to migrate your projects. There is no automatic import since GitLab doesn't know anything about any projects which existed on Gemnasium.com. Security features are free for public (open-source) projects hosted on GitLab.com. -### If your project is hosted on GitLab (`https://gitlab.com / self-hosted`) +### If your project is hosted on GitLab (`https://gitlab.com` / self-hosted) You're almost set! If you're already using [Auto DevOps](../../../topics/autodevops/), you are already covered. Otherwise, you must configure your `.gitlab-ci.yml` according to the [dependency scanning page](../../application_security/dependency_scanning/index.md). -### If your project is hosted on GitHub (`https://github.com / GitHub Enterprise`) +### If your project is hosted on GitHub (`https://github.com` / GitHub Enterprise) Since [GitLab 10.6 comes with GitHub integration](https://about.gitlab.com/features/github/), GitLab users can now create a CI/CD project in GitLab connected to an external |