diff options
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/code_owners.md | 14 | ||||
| -rw-r--r-- | doc/user/project/import/index.md | 11 | ||||
| -rw-r--r-- | doc/user/project/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/license_management.md | 4 | ||||
| -rw-r--r-- | doc/user/project/repository/repository_mirroring.md | 5 |
6 files changed, 28 insertions, 12 deletions
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md index a81c0beb6d0..4ab615a1008 100644 --- a/doc/user/project/code_owners.md +++ b/doc/user/project/code_owners.md @@ -25,8 +25,18 @@ specify themselves as a code owner, all before the new changes get merged to the default branch. When a file matches multiple entries in the `CODEOWNERS` file, -the users from all entries are displayed on the blob page of -the given file. +the users from last pattern matching the file are displayed on the +blob page of the given file. For example, you have the following +`CODEOWNERS` file: + +``` +README.md @user1 + +# This line would also match the file README.md +*.md @user2 +``` + +The user that would show for `README.md` would be `@user2`. ## Approvals by Code Owners diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index a4c844b415d..2ee4bef97ce 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -29,15 +29,14 @@ If you only need to migrate Git repos, you can [import each project by URL](repo If you want to retain all metadata like issues and merge requests, you can use the [import/export feature](../settings/import_export.md) to export projects from self-managed GitLab and import those projects into GitLab.com. -NOTE: **Note:** -This approach assumes all users from the self-managed instance have already been migrated. -If the users haven't been migrated yet, the user conducting the import -will take the place of all references to the missing user(s). +All GitLab user associations (such as comment author) will be changed to the user importing the project. For more information, please see [the import notes](../settings/import_export.md#important-notes). If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-managed to GitLab.com. The order of assets to migrate from a self-managed instance to GitLab.com is the following: -1. [Users](../../../api/users.md) +NOTE: **Note:** +When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-hosted instances as it requires administrator access. + 1. [Groups](../../../api/groups.md) 1. [Projects](../../../api/projects.md) 1. [Project variables](../../../api/project_level_variables.md) @@ -56,3 +55,5 @@ then restore it on the new server. In the event of merging two GitLab instances together (for example, both instances have existing data on them and one can't be wiped), refer to the instructions in [Migrating from self-managed GitLab to GitLab.com](#migrating-from-self-managed-gitlab-to-gitlabcom). + +Additionally, you can migrate users using the [Users API](../../../api/users.md) with an admin user. diff --git a/doc/user/project/index.md b/doc/user/project/index.md index 661c1eebf6d..ea36092168d 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -100,7 +100,7 @@ When you create a project in GitLab, you'll have access to a large number of - [Maven packages](../packages/maven_repository/index.md): your private Maven repository in GitLab. **(PREMIUM)** - [NPM packages](../packages/npm_registry/index.md): your private NPM package registry in GitLab. **(PREMIUM)** - [Code owners](code_owners.md): specify code owners for certain files **(STARTER)** -- [License Compliance](../application_security/license_compliance/index.md): approve and blacklist licenses for projects. **(ULTIMATE)** +- [License Compliance](../compliance/license_compliance/index.md): approve and blacklist licenses for projects. **(ULTIMATE)** - [Dependency List](../application_security/dependency_list/index.md): view project dependencies. **(ULTIMATE)** ### Project integrations diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index edf34c666f8..e0bf32baea6 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -21,7 +21,7 @@ A. Consider you are a software developer working in a team: 1. You gather feedback from your team 1. You work on the implementation optimizing code with [Code Quality reports](code_quality.md) **(STARTER)** 1. You verify your changes with [JUnit test reports](../../../ci/junit_test_reports.md) in GitLab CI/CD -1. You avoid using dependencies whose license is not compatible with your project with [License Compliance reports](../../application_security/license_compliance/index.md) **(ULTIMATE)** +1. You avoid using dependencies whose license is not compatible with your project with [License Compliance reports](../../compliance/license_compliance/index.md) **(ULTIMATE)** 1. You request the [approval](merge_request_approvals.md) from your manager **(STARTER)** 1. Your manager: 1. Pushes a commit with their final review @@ -97,6 +97,7 @@ or link to useful information directly in the merge request page: | [Display arbitrary job artifacts](../../../ci/yaml/README.md#artifactsexpose_as) | Configure CI pipelines with the `artifacts:expose_as` parameter to directly link to selected [artifacts](../pipelines/job_artifacts.md) in merge requests. | | [GitLab CI/CD](../../../ci/README.md) | Build, test, and deploy your code in a per-branch basis with built-in CI/CD. | | [JUnit test reports](../../../ci/junit_test_reports.md) | Configure your CI jobs to use JUnit test reports, and let GitLab display a report on the merge request so that it’s easier and faster to identify the failure without having to check the entire job log. | +| [License Compliance](../../compliance/license_compliance/index.md) **(ULTIMATE)** | Manage the licenses of your dependencies. | | [Metrics Reports](../../../ci/metrics_reports.md) **(PREMIUM)** | Display the Metrics Report on the merge request so that it's fast and easy to identify changes to important metrics. | | [Multi-Project pipelines](../../../ci/multi_project_pipelines.md) **(PREMIUM)** | When you set up GitLab CI/CD across multiple projects, you can visualize the entire pipeline, including all cross-project interdependencies. | | [Pipelines for merge requests](../../../ci/merge_request_pipelines/index.md) | Customize a specific pipeline structure for merge requests in order to speed the cycle up by running only important jobs. | @@ -112,7 +113,6 @@ generated by scanning and reporting any vulnerabilities found in your project: | [Container Scanning](../../application_security/container_scanning/index.md) | Analyze your Docker images for known vulnerabilities. | | [Dynamic Application Security Testing (DAST)](../../application_security/dast/index.md) | Analyze your running web applications for known vulnerabilities. | | [Dependency Scanning](../../application_security/dependency_scanning/index.md) | Analyze your dependencies for known vulnerabilities. | -| [License Compliance](../../application_security/license_compliance/index.md) | Manage the licenses of your dependencies. | | [Static Application Security Testing (SAST)](../../application_security/sast/index.md) | Analyze your source code for known vulnerabilities. | ## Authorization for merge requests diff --git a/doc/user/project/merge_requests/license_management.md b/doc/user/project/merge_requests/license_management.md index df5bd073ade..ed81eb8ca10 100644 --- a/doc/user/project/merge_requests/license_management.md +++ b/doc/user/project/merge_requests/license_management.md @@ -1,5 +1,5 @@ --- -redirect_to: '../../application_security/license_compliance/index.md' +redirect_to: '../../compliance/license_compliance/index.md' --- -This document was moved to [another location](../../application_security/license_compliance/index.md). +This document was moved to [another location](../../compliance/license_compliance/index.md). diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md index fe57df38d37..33fa09255e1 100644 --- a/doc/user/project/repository/repository_mirroring.md +++ b/doc/user/project/repository/repository_mirroring.md @@ -69,6 +69,11 @@ Changes pushed to files in the repository are automatically pushed to the remote In the case of a diverged branch, you will see an error indicated at the **Mirroring repositories** section. +### Configuring push mirrors through the API + +You can also create and modify project push mirrors through the +[remote mirrors API](../../../api/remote_mirrors.md). + ### Push only protected branches **(CORE)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3350) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.3. |