diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-09-21 21:10:16 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-21 21:10:16 -0400 |
| commit | 541d08b8f646081a9024f0af0ae6b3a15ce20136 (patch) | |
| tree | 4f2aeceb1dc86fa9824ba6b7801660253697eba0 /doc | |
| parent | 96fd255597319f41998f3a1edd56475c65af7342 (diff) | |
| download | gitlab-ce-541d08b8f646081a9024f0af0ae6b3a15ce20136.tar.gz | |
Be consistent about "only required for manual install" notes
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/migrate_ci_to_ce/README.md | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md index 38f25c09f9e..3ec541fb441 100644 --- a/doc/migrate_ci_to_ce/README.md +++ b/doc/migrate_ci_to_ce/README.md @@ -77,7 +77,10 @@ database configuration files: # Omnibus installation sudo gitlab-ci-rake backup:create MYSQL_TO_POSTGRESQL=1 -#### 3. Remove cronjob (manual installation) +#### 3. Remove cronjob + +**Note:** This step is only required for **manual installations**. Omnibus users +can [skip to the next step](#part-ii-gitlab-ce-or-ee). # Manual installation cd /home/gitlab_ci/gitlab-ci @@ -162,8 +165,8 @@ The `secrets.yml` file stores encryption keys for secure variables. #### 6. New configuration options for `gitlab.yml` -**Note:** This step is only required for manual installations. Omnibus -installations can [skip to the next step](#7-copy-backup-from-gitlab-ci). +**Note:** This step is only required for **manual installations**. Omnibus users +can [skip to the next step](#7-copy-backup-from-gitlab-ci). There are new configuration options available for `gitlab.yml`. View them with the command below and apply them manually to your current `gitlab.yml`: @@ -223,8 +226,8 @@ You can start GitLab CE (or EE) now and see if everything is working: ### Part III: Nginx configuration -This part is only required for **Manual installations**. Omnibus users can [skip -to the final step](#part-iv-finishing-up). +This section is only required for **manual installations**. Omnibus users can +[skip to the final step](#part-iv-finishing-up). #### 1. Update Nginx configuration |