diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md index 14d8e0fc72f87a8794c3072f242cf2d49f35fe3c..252bcd050c23e1e0553e459a2388bd545d560bc2 100644 --- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md +++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md @@ -376,7 +376,7 @@ These are persistent data and will be shared to every new release. Now, we would need to deploy our app by running `envoy run deploy`, but it won't be necessary since GitLab can handle that for us with CI's [environments](../../environments/index.md), which will be described [later](#setting-up-gitlab-cicd) in this tutorial. Now it's time to commit [Envoy.blade.php](https://gitlab.com/mehranrasulian/laravel-sample/blob/master/Envoy.blade.php) and push it to the `main` branch. -To keep things simple, we commit directly to `main`, without using [feature-branches](../../../topics/gitlab_flow.md#github-flow-as-a-simpler-alternative) since collaboration is beyond the scope of this tutorial. +To keep things simple, we commit directly to `main`, without using feature branches, since collaboration is beyond the scope of this tutorial. In a real world project, teams may use [Issue Tracker](../../../user/project/issues/index.md) and [merge requests](../../../user/project/merge_requests/index.md) to move their code across branches: ```shell diff --git a/doc/ci/yaml/workflow.md b/doc/ci/yaml/workflow.md index e88a96ae1f5679414614d3fca5195735f433259a..4bbdd3a81bf1a0c00f354cb43d6213008260e65f 100644 --- a/doc/ci/yaml/workflow.md +++ b/doc/ci/yaml/workflow.md @@ -117,8 +117,8 @@ does not block triggered pipelines. ### Git Flow with merge request pipelines -You can use `workflow: rules` as part of [Git Flow or similar strategies](../../topics/gitlab_flow.md) -with merge request pipelines. With these rules, you can use [merge request pipeline features](../pipelines/merge_request_pipelines.md) +You can use `workflow: rules` with merge request pipelines. With these rules, +you can use [merge request pipeline features](../pipelines/merge_request_pipelines.md) with feature branches, while keeping long-lived branches to support multiple versions of your software. diff --git a/doc/topics/autodevops/cloud_deployments/auto_devops_with_eks.md b/doc/topics/autodevops/cloud_deployments/auto_devops_with_eks.md index b85b99d1874c815e8e7cc1004307614f17656149..09d27e010c55e3651ef7a1928120d46c0a2b101d 100644 --- a/doc/topics/autodevops/cloud_deployments/auto_devops_with_eks.md +++ b/doc/topics/autodevops/cloud_deployments/auto_devops_with_eks.md @@ -230,8 +230,7 @@ in **Settings > CI/CD > Variables**. ### Work with branches -Following the [GitLab flow](../../gitlab_flow.md#working-with-feature-branches), -you should next create a feature branch to add content to your application: +Next, create a feature branch to add content to your application: 1. In your project's repository, go to the following file: `app/views/welcome/index.html.erb`. This file should only contain a paragraph: `<p>You're on Rails!</p>`. diff --git a/doc/topics/autodevops/cloud_deployments/auto_devops_with_gke.md b/doc/topics/autodevops/cloud_deployments/auto_devops_with_gke.md index f6a6c16e010b032602665e62b81bfe7314257833..74c2ed639bccfc244e33163aa6008aff5f38ef62 100644 --- a/doc/topics/autodevops/cloud_deployments/auto_devops_with_gke.md +++ b/doc/topics/autodevops/cloud_deployments/auto_devops_with_gke.md @@ -235,8 +235,7 @@ in **Settings > CI/CD > Variables**. ### Work with branches -Following the [GitLab flow](../../gitlab_flow.md#working-with-feature-branches), -you should next create a feature branch to add content to your application: +Next, create a feature branch to add content to your application: 1. In your project's repository, go to the following file: `app/views/welcome/index.html.erb`. This file should only contain a paragraph: `<p>You're on Rails!</p>`. diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index d5aa74935f22b57b3242b0d956b0e86f4617e559..9e6bddccbf9a5ea190ca70cddc3372e614b26a90 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -36,7 +36,6 @@ The following resources can help you get started with Git: - Commits: - [Revert a commit](../../user/project/merge_requests/revert_changes.md#revert-a-commit) - [Cherry-picking a commit](../../user/project/merge_requests/cherry_pick_changes.md) - - [Squashing commits](../gitlab_flow.md#squashing-commits-with-rebase) - [Squash-and-merge](../../user/project/merge_requests/squash_and_merge.md) - [Signing commits](../../user/project/repository/gpg_signed_commits/index.md) - [Git stash](stash.md) @@ -82,7 +81,6 @@ If you have problems with Git, the following may help: ## Branching strategies - [Feature branch workflow](../../gitlab-basics/feature_branch_workflow.md) -- [GitLab Flow](../gitlab_flow.md) - [Git Branching - Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) - [Git Branching - Branching Workflows](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows) diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 78384249abc83e40a29666f0c9586606e7134abc..180b24b83e073f2bc7883f3d6cdc5c38cabffb26 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -200,8 +200,7 @@ To create a new branch through the user interface: ## Require everyone to submit merge requests for a protected branch You can force everyone to submit a merge request, rather than allowing them to -check in directly to a protected branch. This setting is compatible with workflows -like the [GitLab workflow](../../topics/gitlab_flow.md). +check in directly to a protected branch: 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project. 1. Select **Settings > Repository**. diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md index a6bb02989a3f42ff4ba749718f356925844f808e..819d91f9d0c5c4c0dac6061f005b7f30879d7a71 100644 --- a/doc/user/project/repository/forking_workflow.md +++ b/doc/user/project/repository/forking_workflow.md @@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Project forking workflow **(FREE)** Whenever possible, it's recommended to work in a common Git repository and use -[branching strategies](../../../topics/gitlab_flow.md) to manage your work. However, +branching strategies to manage your work. However, if you do not have write access for the repository you want to contribute to, you can create a fork.