summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2021-01-07 14:17:33 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2021-01-07 14:17:33 +0000
commit0e5660917f0316a2197ffc5add7a8f01d3e428be (patch)
tree83b18a6ec197bc31d656e63e6e21434bd3096b7d
parent99d0bbe8ab3e9fa8368ac6efd24b2e961d2fe8e3 (diff)
parente315efbe7d3791bed63286e90cbef0321f141fb8 (diff)
downloadgitlab-shell-0e5660917f0316a2197ffc5add7a8f01d3e428be.tar.gz
Merge branch 'remove-default-branch-docs' into 'main'
Remove default branch statement in docs Closes #489 See merge request gitlab-org/gitlab-shell!443
-rw-r--r--README.md7
1 files changed, 0 insertions, 7 deletions
diff --git a/README.md b/README.md
index c167a8a..43297ae 100644
--- a/README.md
+++ b/README.md
@@ -18,13 +18,6 @@ An overview of the four cases described above:
1. git pull over SSH -> gitlab-shell -> API call to gitlab-rails (Authorization) -> accept or decline -> establish Gitaly session
1. git push over SSH -> gitlab-shell (git command is not executed yet) -> establish Gitaly session -> (in Gitaly) gitlab-shell pre-receive hook -> API call to gitlab-rails (authorization) -> accept or decline push
-## Default branch
-
-GitLab Shell is transitioning its default branch from `master` to `main`. For now,
-both branches are valid. All changes go to the `main` branch and are synced manually
-to `master` by the maintainers. We plan to remove the `master` branch as soon as
-possible. The current status is being tracked in [issue 489](https://gitlab.com/gitlab-org/gitlab-shell/-/issues/489).
-
## Code status
[![pipeline status](https://gitlab.com/gitlab-org/gitlab-shell/badges/main/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=main)