diff options
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/import/github.md | 14 | ||||
-rw-r--r-- | doc/user/project/import/img/import_projects_from_github_importer_v12_3.png | bin | 17532 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/import/img/import_projects_from_github_importer_v16_0.png | bin | 0 -> 42352 bytes | |||
-rw-r--r-- | doc/user/project/settings/index.md | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index e7732c02fdf..6b88e87cf5a 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -17,9 +17,11 @@ The namespace is a user or group in GitLab, such as `gitlab.com/sidney-jones` or `gitlab.com/customer-success`. You can use bulk actions in the rails console to move projects to different namespaces. -If you are importing to a self-managed GitLab instance, you can use the -[GitHub Rake task](../../../administration/raketasks/github_import.md) instead. This allows you to import projects -without the constraints of a [Sidekiq](../../../development/sidekiq/index.md) worker. +- If you are importing to a self-managed GitLab instance, you can use the [GitHub Rake task](../../../administration/raketasks/github_import.md) instead. The + Rake task imports projects without the constraints of a [Sidekiq](../../../development/sidekiq/index.md) worker. +- If you are importing from GitHub Enterprise to GitLab.com, use the + [GitLab Import API](../../../api/import.md#import-repository-from-github) GitHub endpoint instead. This allows you to provide a different domain to import the project from. + Using the UI, the GitHub importer always imports from the `github.com` domain. When importing projects: @@ -185,7 +187,7 @@ To open an repository in GitLab URL after it has been imported, select its GitLa Completed imports can be re-imported by selecting **Re-import** and specifying new name. This creates a new copy of the source project. -![GitHub importer page](img/import_projects_from_github_importer_v12_3.png) +![GitHub importer page](img/import_projects_from_github_importer_v16_0.png) ### Check status of imports @@ -193,9 +195,9 @@ Completed imports can be re-imported by selecting **Re-import** and specifying n After imports are completed, they can be in one of three states: -- **Completed**: GitLab imported all repository entities. +- **Complete**: GitLab imported all repository entities. - **Partially completed**: GitLab failed to import some repository entities. -- **Failed**: GitLab imported no repository entities. +- **Failed**: GitLab aborted the import after a critical error occurred. Expand **Details** to see a list of [repository entities](#imported-data) that failed to import. diff --git a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png b/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png Binary files differdeleted file mode 100644 index 3ac03c0ecc5..00000000000 --- a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png +++ /dev/null diff --git a/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png b/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png Binary files differnew file mode 100644 index 00000000000..190474c4d89 --- /dev/null +++ b/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 2df86038789..47500673b99 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -59,6 +59,9 @@ compliance framework using either: compliance frameworks on subgroups with GraphQL, the framework is created on the root ancestor if the user has the correct permissions. The GitLab UI presents a read-only view to discourage this behavior. +NOTE: +Frameworks can not be added to projects in personal namespaces. + ## Configure project visibility, features, and permissions To configure visibility, features, and permissions for a project: |