diff --git a/_toc.yml b/_toc.yml index 81c9b774..45f0a10c 100644 --- a/_toc.yml +++ b/_toc.yml @@ -214,6 +214,7 @@ chapters: - file: services/user-guide/gitea/gitea sections: - file: services/user-guide/gitea/gitea-faq + - file: services/user-guide/gitea/gitea-migration - file: services/user-guide/gitea/gitea-pages - file: services/user-guide/gitea/gitea-runner - file: services/user-guide/gitea/gitea-snippets diff --git a/services/user-guide/gitea/gitea-faq.md b/services/user-guide/gitea/gitea-faq.md index f3de7977..53ec47b7 100644 --- a/services/user-guide/gitea/gitea-faq.md +++ b/services/user-guide/gitea/gitea-faq.md @@ -21,45 +21,9 @@ There are two ways to work around that: [!NOTE] If you work with docker or want to interact with the API (https://gitea.psi.ch) you have to create an access token. -## My Project was migrated and I can't push anymore -This Project was archived and is now available on https://gitea.psi.ch -Please use following commands to update your local git: - -- `git remote -v` -- If the output starts with "origin https..." use option 1 otherwise 2 -1. `git remote set-url https://gitea.psi.ch/{Org}/{Repo}.git` -2. `git remote set-url git@gitea.psi.ch:/{Org}/{Repo}.git` -If you have not recieved a special notification about the archival the organization is the Gitlab group name. - -More information about archived projects can be found here: -- https://docs.gitlab.com/user/project/working_with_projects/#archive-a-project - ### My LFS files are not tracked correctly When you just change the remote you have to re-push your LFS files explicedly. `git lfs push --all git@gitea.psi.ch:{org}/{repo}.git` -## I want to migrate a project from Gitlab / Github to Gitea -Login to https://gitea.psi.ch with your PSI account (Username: max.muster@psi.ch Password: SUPERSECRET123) and answer the MFA challenge. -Since Gitea is a GitHub fork, you will find organizations instead of groups. Every user is allowed to create organizations. -When should I create a new organization? -> If you are (or feel) responsible for a certain team in PSI it makes sense to create an organization named likewise. -Try to use the official names used at PSI. -In the top left corner you can click on "Explore" and then "Organizations" to see if someone already created the desired organization. - -Optional: -- Click the "+" in the top right of your screen and create an organization -- Authorization inside Organizations can be done via "Teams" - "New Team" and give the persmissions you need -- If you want to use AD Groups to authorize people in your Teams please contact [Gitea Project](mailto:gitea@psi.ch) - -Migration: -- Click the "+" in the top right of your screen and click "New Migration" -- Choose the Source you want to migrate from -- Enter the HTTPS clone URL -- On the source you need to create an access token for that project - - Token to migrate a single project [How to create a project accesss token in Gitlab](https://docs.gitlab.com/user/project/settings/project_access_tokens/#create-a-project-access-token) - - Token to migrate multiple projects you have permissions on [How to create a personal access token in Gitlab](https://docs.gitlab.com/user/profile/personal_access_tokens/#create-a-personal-access-token) -- Paste the token in "Access Token" -- Choose the migration options (Attention! If you choose mirror, you won't be able to migrate releases!) -- Choose an owner (Organization or if its a personal project your username) and give it a name (can be the existing one). - ## I had a collaboration with non PSI Users on gitlab.psi.ch All "ext-" users have been imported as restricted users and must be explicitly added to a project. If you are missing a user and you are sure it has a PSI account, message [Gitea Project](mailto:gitea@psi.ch) diff --git a/services/user-guide/gitea/gitea-migration.md b/services/user-guide/gitea/gitea-migration.md new file mode 100644 index 00000000..0a842c64 --- /dev/null +++ b/services/user-guide/gitea/gitea-migration.md @@ -0,0 +1,39 @@ +# Migration +If you want to migrate a project from another versioncontroll tool, the most frequently asked questions are agregated here. + +## I want to migrate a project from Gitlab / Github to Gitea +Login to https://gitea.psi.ch with your PSI account (Username: max.muster@psi.ch Password: SUPERSECRET123) and answer the MFA challenge. +Since Gitea is a GitHub fork, you will find organizations instead of groups. Every user is allowed to create organizations. +When should I create a new organization? -> If you are (or feel) responsible for a certain team in PSI it makes sense to create an organization named likewise. +Try to use the official names used at PSI. +In the top left corner you can click on "Explore" and then "Organizations" to see if someone already created the desired organization. + +Optional: +- Click the "+" in the top right of your screen and create an organization +- Authorization inside Organizations can be done via "Teams" - "New Team" and give the persmissions you need +- If you want to use AD Groups to authorize people in your Teams please contact [Gitea Project](mailto:gitea@psi.ch) + +Migration: +- Click the "+" in the top right of your screen and click "New Migration" +- Choose the Source you want to migrate from +- Enter the HTTPS clone URL +- On the source you need to create an access token for that project + - Token to migrate a single project [How to create a project accesss token in Gitlab](https://docs.gitlab.com/user/project/settings/project_access_tokens/#create-a-project-access-token) + - Token to migrate multiple projects you have permissions on [How to create a personal access token in Gitlab](https://docs.gitlab.com/user/profile/personal_access_tokens/#create-a-personal-access-token) +- Paste the token in "Access Token" +- Choose the migration options (Attention! If you choose mirror, you won't be able to migrate releases!) +- Choose an owner (Organization or if its a personal project your username) and give it a name (can be the existing one). + +## My Project was migrated and I can't push anymore +This Project was archived and is now available on https://gitea.psi.ch +Please use following commands to update your local git: + +- `git remote -v` +- If the output starts with "origin https..." use option 1 otherwise 2 +1. `git remote set-url https://gitea.psi.ch/{Org}/{Repo}.git` +2. `git remote set-url git@gitea.psi.ch:/{Org}/{Repo}.git` +If you have not recieved a special notification about the archival the organization is the Gitlab group name. + +More information about archived projects can be found here: +- https://docs.gitlab.com/user/project/working_with_projects/#archive-a-project +