diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
commit | 429d1abad29d379d8bc8f5219eb72384ad485deb (patch) | |
tree | 5c8f9c96c203dbeb3e3e89f3979ce60453340f3f /doc | |
parent | e464f195ff5debc3e9aad0f8c4537404b92019c6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/high_availability/redis.md | 2 | ||||
-rw-r--r-- | doc/development/README.md | 3 | ||||
-rw-r--r-- | doc/development/deleting_migrations.md | 33 | ||||
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 16 |
4 files changed, 50 insertions, 4 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index b82e8947e39..ba4599e5bcd 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -68,7 +68,7 @@ Omnibus: gitaly['enable'] = false redis['bind'] = '0.0.0.0' - redis['port'] = '6379' + redis['port'] = 6379 redis['password'] = 'SECRET_PASSWORD_HERE' gitlab_rails['auto_migrate'] = false diff --git a/doc/development/README.md b/doc/development/README.md index 6f712fcf0f4..7e1a563ea02 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -99,6 +99,7 @@ description: 'Learn how to contribute to GitLab.' - [Post deployment migrations](post_deployment_migrations.md) - [Background migrations](background_migrations.md) - [Swapping tables](swapping_tables.md) +- [Deleting exiting migrations](deleting_migrations.md) ### Best practices @@ -118,7 +119,7 @@ description: 'Learn how to contribute to GitLab.' - [Database helper modules](database_helpers.md) - [Code comments](code_comments.md) -## Case studies +### Case studies - [Database case study: Filtering by label](filtering_by_label.md) - [Database case study: Namespaces storage statistics](namespaces_storage_statistics.md) diff --git a/doc/development/deleting_migrations.md b/doc/development/deleting_migrations.md new file mode 100644 index 00000000000..438e8c9f5e9 --- /dev/null +++ b/doc/development/deleting_migrations.md @@ -0,0 +1,33 @@ +# Delete existing migrations + +When removing existing migrations from the GitLab project, you have to take into account +the possibility of the migration already been included in past releases or in the current release, and thus already executed on GitLab.com and/or in self-hosted instances. + +Because of it, it's not possible to delete existing migrations, as that could lead to: + +- Schema inconsistency, as changes introduced into the database were not rollbacked properly. +- Leaving a record on the `schema_versions` table, that points out to migration that no longer exists on the codebase. + +Instead of deleting we can opt for disabling the migration. + +## Pre-requisites to disable a migration + +Migrations can be disabled if: + +- They caused a timeout or general issue on GitLab.com. +- They are obsoleted, e.g. changes are not necessary due to a feature change. +- Migration is a data migration only, i.e. the migration does not change the database schema. + +## How to disable a data migration? + +In order to disable a migration, the following steps apply to all types of migrations: + +1. Turn the migration into a noop by removing the code inside `#up`, `#down` + or `#perform` methods, and adding `#no-op` comment instead. +1. Add a comment explaining why the code is gone. + +Disabling migrations requires explicit approval of Database Maintainer. + +## Examples + +- [Disable scheduling of productivity analytics](https://gitlab.com/gitlab-org/gitlab/merge_requests/17253) diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 6ba027dc24a..ca2a0127ede 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -29,15 +29,27 @@ If you want to disable it for a specific project, you can do so in ## Maximum artifacts size **(CORE ONLY)** The maximum size of the [job artifacts](../../../administration/job_artifacts.md) -can be set in the Admin area of your GitLab instance. The value is in *MB* and +can be set at the project level, group level, and at the instance level. The value is in *MB* and the default is 100MB per job; on GitLab.com it's [set to 1G](../../gitlab_com/index.md#gitlab-cicd). -To change it: +To change it at the instance level: 1. Go to **Admin area > Settings > Continuous Integration and Deployment**. 1. Change the value of maximum artifacts size (in MB). 1. Hit **Save changes** for the changes to take effect. +at the group level (this will override the instance setting): + +1. Go to **Group > Settings > CI / CD > General Pipelines**. +1. Change the value of maximum artifacts size (in MB). +1. Hit **Save changes** for the changes to take effect. + +at the project level (this will override the instance and group settings): + +1. Go to **Project > Settings > CI / CD > General Pipelines**. +1. Change the value of maximum artifacts size (in MB). +1. Hit **Save changes** for the changes to take effect. + ## Default artifacts expiration **(CORE ONLY)** The default expiration time of the [job artifacts](../../../administration/job_artifacts.md) |