diff options
Diffstat (limited to 'doc/administration/merge_request_diffs.md')
| -rw-r--r-- | doc/administration/merge_request_diffs.md | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/administration/merge_request_diffs.md b/doc/administration/merge_request_diffs.md index 3250a2339e2..00ea1e43600 100644 --- a/doc/administration/merge_request_diffs.md +++ b/doc/administration/merge_request_diffs.md @@ -21,7 +21,7 @@ that only [stores outdated diffs](#alternative-in-database-storage) outside of d ## Using external storage -**In Omnibus installations:** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb` and add the following line: @@ -38,10 +38,10 @@ that only [stores outdated diffs](#alternative-in-database-storage) outside of d gitlab_rails['external_diffs_storage_path'] = "/mnt/storage/external-diffs" ``` -1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. +1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect. GitLab then migrates your existing merge request diffs to external storage. -**In installations from source:** +For self-compiled installations: 1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following lines: @@ -74,7 +74,7 @@ Instead of storing the external diffs on disk, we recommended the use of an obje store like AWS S3 instead. This configuration relies on valid AWS credentials to be configured already. -**In Omnibus installations:** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb` and add the following line: @@ -83,10 +83,10 @@ be configured already. ``` 1. Set [object storage settings](#object-storage-settings). -1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. +1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect. GitLab then migrates your existing merge request diffs to external storage. -**In installations from source:** +For self-compiled installations: 1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following lines: @@ -109,7 +109,7 @@ In GitLab 13.2 and later, you should use the This section describes the earlier configuration format. For source installations, these settings are nested under `external_diffs:` and -then `object_store:`. On Omnibus installations, they are prefixed by +then `object_store:`. On Linux package installations, they are prefixed by `external_diffs_object_store_`. | Setting | Description | Default | @@ -123,7 +123,7 @@ then `object_store:`. On Omnibus installations, they are prefixed by See [the available connection settings for different providers](object_storage.md#configure-the-connection-settings). -**In Omnibus installations:** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb` and add the following lines by replacing with the values you want: @@ -151,9 +151,9 @@ See [the available connection settings for different providers](object_storage.m } ``` -1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. +1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect. -**In installations from source:** +For self-compiled installations: 1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following lines: @@ -182,7 +182,7 @@ in the database. To enable this feature, perform the following steps: -**In Omnibus installations:** +For Linux package installations: 1. Edit `/etc/gitlab/gitlab.rb` and add the following line: @@ -190,9 +190,9 @@ To enable this feature, perform the following steps: gitlab_rails['external_diffs_when'] = 'outdated' ``` -1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. +1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect. -**In installations from source:** +For self-compiled installations: 1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following lines: @@ -236,13 +236,13 @@ Then you are affected by this issue. Because it's not possible to safely determi all these conditions automatically, we've provided a Rake task in GitLab v13.2.0 that you can run manually to correct the data: -**In Omnibus installations:** +For Linux package installations: ```shell sudo gitlab-rake gitlab:external_diffs:force_object_storage ``` -**In installations from source:** +For self-compiled installations: ```shell sudo -u git -H bundle exec rake gitlab:external_diffs:force_object_storage RAILS_ENV=production |