diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-28 07:57:29 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-28 07:57:29 +0000 |
| commit | 949d1b37e740ae28e1a3eaf41ce10388617385d6 (patch) | |
| tree | c831e1c5b28a4b7704ee26d533cdf03d731a9cbb /config/gitlab.yml.example | |
| parent | 092445a4025bc1033e2028655ba739961f5e4ebb (diff) | |
| parent | 04c5e637f827d869f8bbfb21ca41eb552c3324d6 (diff) | |
| download | gitlab-ce-949d1b37e740ae28e1a3eaf41ce10388617385d6.tar.gz | |
Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'
LFS direct upload port to CE
Closes #44548
See merge request gitlab-org/gitlab-ce!17752
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a23145de3e5..8db66037d61 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -711,7 +711,7 @@ test: provider: AWS # Only AWS supported at the moment aws_access_key_id: AWS_ACCESS_KEY_ID aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: eu-central-1 + region: us-east-1 artifacts: path: tmp/tests/artifacts enabled: true @@ -725,7 +725,7 @@ test: provider: AWS # Only AWS supported at the moment aws_access_key_id: AWS_ACCESS_KEY_ID aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: eu-central-1 + region: us-east-1 uploads: storage_path: tmp/tests/public object_store: @@ -734,7 +734,7 @@ test: provider: AWS # Only AWS supported at the moment aws_access_key_id: AWS_ACCESS_KEY_ID aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: eu-central-1 + region: us-east-1 gitlab: host: localhost port: 80 |