diff --git a/web/content/docs/devguide/advanced/gitlab-migration.pandoc b/web/content/docs/devguide/advanced/gitlab-migration.pandoc new file mode 100644 index 0000000000000000000000000000000000000000..0552d8bd1072d005cb050641c3136b607cfb3f2b --- /dev/null +++ b/web/content/docs/devguide/advanced/gitlab-migration.pandoc @@ -0,0 +1,28 @@ ++++ +date = "2020-05-29T11:00:13+01:00" +title = "Migrate to GitLab" +author = "Lars Bilke" +weight = 1043 + +[menu] + [menu.devguide] + parent = "advanced" ++++ + +## Migrate your local repos to point to GitLab + +You have to modify your git remotes to point to the new GitLab repos. Assuming the former official git repo remote is called `upstream`: + +```bash +git remote set-url upstream https://gitlab.opengeosys.org/ogs/ogs.git +``` + +Assuming your personal forks remote is called `origin`: + +``` +git remote set-url origin git@gitlab.opengeosys.org:YOUR-USERNAME/ogs.git +``` + +---- + +Or you can clone a fresh repo by following the steps in [Get the source code]({{< ref "get-the-source-code.pandoc" >}}). diff --git a/web/content/docs/devguide/advanced/gitlab-login.png b/web/content/docs/devguide/getting-started/gitlab-login.png similarity index 100% rename from web/content/docs/devguide/advanced/gitlab-login.png rename to web/content/docs/devguide/getting-started/gitlab-login.png diff --git a/web/content/docs/devguide/advanced/gitlab.pandoc b/web/content/docs/devguide/getting-started/gitlab.pandoc similarity index 66% rename from web/content/docs/devguide/advanced/gitlab.pandoc rename to web/content/docs/devguide/getting-started/gitlab.pandoc index d7d5b2119fd41085162a4a923f79244a1ddf423f..0ca69e88e210e7c689152433705227310dac6911 100644 --- a/web/content/docs/devguide/advanced/gitlab.pandoc +++ b/web/content/docs/devguide/getting-started/gitlab.pandoc @@ -1,17 +1,17 @@ +++ date = "2018-02-26T11:00:13+01:00" -title = "GitLab" +title = "Set Up GitLab" author = "Lars Bilke" -weight = 1041 +weight = 1002 [menu] [menu.devguide] - parent = "advanced" + parent = "getting-started" +++ ## Introduction -[GitLab](https://gitlab.com) is a web-based Git repository manager similar to [GitHub](https://github.com). GitLab can be self-hosted and we do just that with <https://gitlab.opengeosys.org>. For the moment all OGS repositories are still hosted at [github.com/ufz](https://github.com/ufz) but we store benchmark data files on our own GitLab because of storage limits on GitHub. +[GitLab](https://gitlab.com) is a web-based development and collaboration tool similar to [GitHub](https://github.com). We self-host GitLab at <https://gitlab.opengeosys.org> and migrated our development workflows from GitHub in June 2020. Development takes place in the [ogs-group](https://gitlab.opengeosys.org/ogs) and the authoritative repository is at [ogs/ogs](https://gitlab.opengeosys.org/ogs/ogs). ## Setup an account