Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
3cdb539841
commit
0574192dca
|
@ -1 +1 @@
|
|||
8.45.0
|
||||
8.46.0
|
||||
|
|
|
@ -322,7 +322,7 @@ pipelines and merge request pipelines don't run, as there's no rule allowing the
|
|||
```yaml
|
||||
workflow:
|
||||
rules:
|
||||
- if: $CI_COMMIT_REF_NAME =~ /-wip$/
|
||||
- if: $CI_COMMIT_MESSAGE =~ /-wip$/
|
||||
when: never
|
||||
- if: '$CI_PIPELINE_SOURCE == "push"'
|
||||
```
|
||||
|
|
|
@ -534,6 +534,44 @@ For installations from source:
|
|||
|
||||
1. [Restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect
|
||||
|
||||
##### Using Azure Blob storage
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25877) in GitLab 13.4.
|
||||
|
||||
For Omnibus GitLab packages:
|
||||
|
||||
1. Edit `/etc/gitlab/gitlab.rb`:
|
||||
|
||||
```ruby
|
||||
gitlab_rails['backup_upload_connection'] = {
|
||||
'provider' => 'AzureRM',
|
||||
'azure_storage_account_name' => '<AZURE STORAGE ACCOUNT NAME>',
|
||||
'azure_storage_access_key' => '<AZURE STORAGE ACCESS KEY>',
|
||||
'azure_storage_domain' => 'blob.core.windows.net', # Optional
|
||||
}
|
||||
gitlab_rails['backup_upload_remote_directory'] = '<AZURE BLOB CONTAINER>'
|
||||
```
|
||||
|
||||
1. [Reconfigure GitLab](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect
|
||||
|
||||
For installations from source:
|
||||
|
||||
1. Edit `home/git/gitlab/config/gitlab.yml`:
|
||||
|
||||
```yaml
|
||||
backup:
|
||||
upload:
|
||||
connection:
|
||||
provider: 'AzureRM'
|
||||
azure_storage_account_name: '<AZURE STORAGE ACCOUNT NAME>'
|
||||
azure_storage_access_key: '<AZURE STORAGE ACCESS KEY>'
|
||||
remote_directory: '<AZURE BLOB CONTAINER>'
|
||||
```
|
||||
|
||||
1. [Restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect
|
||||
|
||||
See [the table of Azure parameters](../administration/object_storage.md#azure-blob-storage) for more details.
|
||||
|
||||
##### Specifying a custom directory for backups
|
||||
|
||||
Note: This option only works for remote storage. If you want to group your backups
|
||||
|
|
|
@ -10,7 +10,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
|||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/33422) in GitLab 11.5.
|
||||
> - Available on GitLab.com in GitLab 12.4.
|
||||
|
||||
You can enable Pages access control on your project, so that only
|
||||
You can enable Pages access control on your project
|
||||
if your administrator has [enabled the access control feature](../../../administration/pages/index.md#access-control)
|
||||
on your GitLab instance. When enabled, only
|
||||
[members of your project](../../permissions.md#project-members-permissions)
|
||||
(at least Guest) can access your website:
|
||||
|
||||
|
|
Loading…
Reference in New Issue