diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/geo/replication/configuration.md | 13 | ||||
| -rw-r--r-- | doc/administration/geo/replication/index.md | 1 | ||||
| -rw-r--r-- | doc/administration/lfs/manage_large_binaries_with_git_lfs.md | 7 | ||||
| -rw-r--r-- | doc/api/group_import_export.md | 2 | ||||
| -rw-r--r-- | doc/development/contributing/issue_workflow.md | 2 | ||||
| -rw-r--r-- | doc/development/database_review.md | 7 | ||||
| -rw-r--r-- | doc/development/documentation/styleguide.md | 15 | ||||
| -rw-r--r-- | doc/topics/git/index.md | 1 |
8 files changed, 34 insertions, 14 deletions
diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md index 1434eeb61af..ed3af59b7f0 100644 --- a/doc/administration/geo/replication/configuration.md +++ b/doc/administration/geo/replication/configuration.md @@ -314,6 +314,19 @@ It is important to note that selective synchronization: Selective synchronization restrictions are implemented on the **secondary** nodes, not the **primary** node. +### Git operations on unreplicated respositories + +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2562) in GitLab 12.10. + +Git clone, pull, and push operations over HTTP(S) are supported for repositories that +exist on the **primary** node but not on **secondary** nodes. This situation can occur +when: + +- Selective synchronization does not include the project attached to the repository. +- The repository is actively being replicated but has not completed yet. + +SSH [support is planned](https://gitlab.com/groups/gitlab-org/-/epics/2562). + ## Upgrading Geo See the [updating the Geo nodes document](updating_the_geo_nodes.md). diff --git a/doc/administration/geo/replication/index.md b/doc/administration/geo/replication/index.md index 4f598162a63..74f9f8c05f4 100644 --- a/doc/administration/geo/replication/index.md +++ b/doc/administration/geo/replication/index.md @@ -244,6 +244,7 @@ CAUTION: **Caution:** This list of limitations only reflects the latest version of GitLab. If you are using an older version, extra limitations may be in place. - Pushing directly to a **secondary** node redirects (for HTTP) or proxies (for SSH) the request to the **primary** node instead of [handling it directly](https://gitlab.com/gitlab-org/gitlab/issues/1381), except when using Git over HTTP with credentials embedded within the URI. For example, `https://user:password@secondary.tld`. +- Cloning, pulling, or pushing repositories that exist on the **primary** node but not on the **secondary** nodes where [selective synchronization](configuration.md#selective-synchronization) does not include the project is not supported over SSH [but support is planned](https://gitlab.com/groups/gitlab-org/-/epics/2562). HTTP(S) is supported. - The **primary** node has to be online for OAuth login to happen. Existing sessions and Git are not affected. - The installation takes multiple manual steps that together can take about an hour depending on circumstances. We are working on improving this experience. See [Omnibus GitLab issue #2978](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2978) for details. - Real-time updates of issues/merge requests (for example, via long polling) doesn't work on the **secondary** node. diff --git a/doc/administration/lfs/manage_large_binaries_with_git_lfs.md b/doc/administration/lfs/manage_large_binaries_with_git_lfs.md index 61b8f28293f..27cf27fddc9 100644 --- a/doc/administration/lfs/manage_large_binaries_with_git_lfs.md +++ b/doc/administration/lfs/manage_large_binaries_with_git_lfs.md @@ -93,6 +93,13 @@ git lfs fetch origin master Read the documentation on how to [migrate an existing Git repo with Git LFS](../../topics/git/migrate_to_git_lfs/index.md). +### Removing objects from LFS + +To remove objects from LFS: + +1. Use [BFG-Cleaner](../../user/project/repository/reducing_the_repo_size_using_git.md#using-the-bfg-repo-cleaner) or [filter-branch](../../user/project/repository/reducing_the_repo_size_using_git.md#using-git-filter-branch) to remove the objects from the repository. +1. Delete the relevant LFS lines for the objects you have removed from your `.gitattributes` file and commit those changes. + ## File Locking > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/35856) in GitLab 10.5. diff --git a/doc/api/group_import_export.md b/doc/api/group_import_export.md index 039f81a18d0..50e8bd9dcf2 100644 --- a/doc/api/group_import_export.md +++ b/doc/api/group_import_export.md @@ -94,3 +94,5 @@ Note the following: to allow project imports into the desired group structure. - Imported groups are given a `private` visibility level, unless imported into a parent group. - If imported into a parent group, subgroups will inherit a similar level of visibility, unless otherwise restricted. +- To preserve the member list and their respective permissions on imported groups, + review the users in these groups. Make sure these users exist before importing the desired groups. diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 94cf1c223dd..31d99813061 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -14,7 +14,7 @@ see fit. ## Issue triaging -Our issue triage policies are [described in our handbook](https://about.gitlab.com/handbook/engineering/issue-triage/). +Our issue triage policies are [described in our handbook](https://about.gitlab.com/handbook/engineering/quality/issue-triage/). You are very welcome to help the GitLab team triage issues. We also organize [issue bash events](https://gitlab.com/gitlab-org/gitlab-foss/issues/17815) once every quarter. diff --git a/doc/development/database_review.md b/doc/development/database_review.md index 9c428c62434..0fdf255e266 100644 --- a/doc/development/database_review.md +++ b/doc/development/database_review.md @@ -45,13 +45,6 @@ A database **reviewer**'s role is to: reassign MR to the database **maintainer** suggested by Reviewer Roulette. -#### When there are no database maintainers available - -Currently we have a [critical shortage of database maintainers](https://gitlab.com/gitlab-org/gitlab/issues/29717). Until we are able to increase the number of database maintainers to support the volume of reviews, we have implemented this temporary solution. If the database **reviewer** cannot find an available database **maintainer** then: - -1. Assign the MR for a second review by a **database trainee maintainer** for further review. -1. Once satisfied with the review process and if the database **maintainer** is still not available, skip the database maintainer approval step and assign the merge request to a backend maintainer for final review and approval. - A database **maintainer**'s role is to: - Perform the final database review on the MR. diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md index 88f8b9b57d2..16a175ec115 100644 --- a/doc/development/documentation/styleguide.md +++ b/doc/development/documentation/styleguide.md @@ -972,6 +972,7 @@ The following are examples of source Markdown for menu items with their publishe 1. Go to **{book}** **Wiki** 1. Go to **{snippet}** **Snippets** 1. Go to **{users}** **Members** +1. Select the **More actions** **{ellipsis_v}** icon > **Hide stage** ``` 1. Go to **{home}** **Project overview > Details** @@ -986,6 +987,7 @@ The following are examples of source Markdown for menu items with their publishe 1. Go to **{book}** **Wiki** 1. Go to **{snippet}** **Snippets** 1. Go to **{users}** **Members** +1. Select the **More actions** **{ellipsis_v}** icon > **Hide stage** ## Alert boxes @@ -1364,17 +1366,18 @@ NOTE: **Note:** The [Product Manager for the relevant group](https://about.gitlab.com/handbook/product/categories/#devops-stages) must review and approve the addition or removal of any mentions of using feature flags before the doc change is merged. -The following is sample text for adding feature flag documentation for a feature: +The following is sample text for adding feature flag documentation for a feature that is +off by default: ````md -### Disabling the feature +### Enabling the feature -This feature comes with the `:feature_flag` feature flag enabled by default. However, in some cases -this feature is incompatible with old configuration. To turn off the feature while configuration is -migrated, ask a GitLab administrator with Rails console access to run the following command: +This feature comes with the `:feature_flag` feature flag disabled by default. In some cases, +this feature is incompatible with an old configuration. To turn on the feature, +ask a GitLab administrator with Rails console access to run the following command: ```ruby -Feature.disable(:feature_flag) +Feature.enable(:feature_flag) ``` ```` diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index c7abfb1d974..4b76f5bdc58 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -85,6 +85,7 @@ The following relate to Git Large File Storage: - [Getting Started with Git LFS](https://about.gitlab.com/blog/2017/01/30/getting-started-with-git-lfs-tutorial/) - [Migrate an existing Git repo with Git LFS](migrate_to_git_lfs/index.md) +- [Removing objects from LFS](../../administration/lfs/manage_large_binaries_with_git_lfs.md#removing-objects-from-lfs) - [GitLab Git LFS user documentation](../../administration/lfs/manage_large_binaries_with_git_lfs.md) - [GitLab Git LFS admin documentation](../../administration/lfs/lfs_administration.md) - [git-annex to Git-LFS migration guide](../../administration/lfs/migrate_from_git_annex_to_git_lfs.md) |