Commit 999b7cae authored by Marcel Amirault's avatar Marcel Amirault

Move forking workflow into repository docs

Move forking_workflow.md into project/repository,
and make sure all moved docs are linked in proper
higher level indexes as needed, removing old links from
workflow index.
parent c3dbb708
...@@ -162,9 +162,10 @@ Learn how to install, configure, update, and maintain your GitLab instance. ...@@ -162,9 +162,10 @@ Learn how to install, configure, update, and maintain your GitLab instance.
## Git configuration options ## Git configuration options
- [Custom Git hooks](custom_hooks.md): Custom Git hooks (on the filesystem) for when webhooks aren't enough. - [Custom Git hooks](custom_hooks.md): Custom Git hooks (on the filesystem) for when webhooks aren't enough.
- [Git LFS configuration](../workflow/lfs/lfs_administration.md): Learn how to configure LFS for GitLab. - [Git LFS configuration](lfs/lfs_administration.md): Learn how to configure LFS for GitLab.
- [Housekeeping](housekeeping.md): Keep your Git repositories tidy and fast. - [Housekeeping](housekeeping.md): Keep your Git repositories tidy and fast.
- [Configuring Git Protocol v2](git_protocol.md): Git protocol version 2 support. - [Configuring Git Protocol v2](git_protocol.md): Git protocol version 2 support.
- [Manage large files with `git-annex` (Deprecated)](git_annex.md)
## Monitoring GitLab ## Monitoring GitLab
......
...@@ -183,7 +183,8 @@ CI Artifacts are S3 compatible since **9.4** (GitLab Premium), and available in ...@@ -183,7 +183,8 @@ CI Artifacts are S3 compatible since **9.4** (GitLab Premium), and available in
##### LFS Objects ##### LFS Objects
LFS Objects implements a similar storage pattern using 2 chars, 2 level folders, following Git own implementation: [LFS Objects in GitLab](lfs/manage_large_binaries_with_git_lfs.md) implement a similar
storage pattern using 2 chars, 2 level folders, following Git's own implementation:
```ruby ```ruby
"shared/lfs-objects/#{oid[0..1}/#{oid[2..3]}/#{oid[4..-1]}" "shared/lfs-objects/#{oid[0..1}/#{oid[2..3]}/#{oid[4..-1]}"
...@@ -192,7 +193,7 @@ LFS Objects implements a similar storage pattern using 2 chars, 2 level folders, ...@@ -192,7 +193,7 @@ LFS Objects implements a similar storage pattern using 2 chars, 2 level folders,
"shared/lfs-objects/89/09/029eb962194cfb326259411b22ae3f4a814b5be4f80651735aeef9f3229c" "shared/lfs-objects/89/09/029eb962194cfb326259411b22ae3f4a814b5be4f80651735aeef9f3229c"
``` ```
They are also S3 compatible since **10.0** (GitLab Premium), and available in GitLab Core since **10.7**. LFS objects are also [S3 compatible](lfs/lfs_administration.md#storing-lfs-objects-in-remote-object-storage).
[ce-2821]: https://gitlab.com/gitlab-com/infrastructure/issues/2821 [ce-2821]: https://gitlab.com/gitlab-com/infrastructure/issues/2821
[ce-28283]: https://gitlab.com/gitlab-org/gitlab-foss/issues/28283 [ce-28283]: https://gitlab.com/gitlab-org/gitlab-foss/issues/28283
......
...@@ -36,7 +36,7 @@ include a regression test are merged quickly, while new features without proper ...@@ -36,7 +36,7 @@ include a regression test are merged quickly, while new features without proper
tests might be slower to receive feedback. The workflow to make a merge tests might be slower to receive feedback. The workflow to make a merge
request is as follows: request is as follows:
1. [Fork](../../user/project/forking_workflow.md) the project into 1. [Fork](../../user/project/repository/forking_workflow.md) the project into
your personal namespace (or group) on GitLab.com. your personal namespace (or group) on GitLab.com.
1. Create a feature branch in your fork (don't work off `master`). 1. Create a feature branch in your fork (don't work off `master`).
1. Write [tests](../rake_tasks.md#run-tests) and code. 1. Write [tests](../rake_tasks.md#run-tests) and code.
......
# How Git object deduplication works in GitLab # How Git object deduplication works in GitLab
When a GitLab user [forks a project](../user/project/forking_workflow.md), When a GitLab user [forks a project](../user/project/repository/forking_workflow.md),
GitLab creates a new Project with an associated Git repository that is a GitLab creates a new Project with an associated Git repository that is a
copy of the original project at the time of the fork. If a large project copy of the original project at the time of the fork. If a large project
gets forked often, this can lead to a quick increase in Git repository gets forked often, this can lead to a quick increase in Git repository
......
...@@ -8,4 +8,4 @@ A fork is a copy of an original repository that you put in another namespace ...@@ -8,4 +8,4 @@ A fork is a copy of an original repository that you put in another namespace
where you can experiment and apply changes that you can later decide whether or where you can experiment and apply changes that you can later decide whether or
not to share, without affecting the original project. not to share, without affecting the original project.
It takes just a few steps to [fork a project in GitLab](../user/project/forking_workflow.md#creating-a-fork). It takes just a few steps to [fork a project in GitLab](../user/project/repository/forking_workflow.md#creating-a-fork).
...@@ -24,7 +24,7 @@ Create issues, labels, milestones, cast your vote, and review issues. ...@@ -24,7 +24,7 @@ Create issues, labels, milestones, cast your vote, and review issues.
Create merge requests and review code. Create merge requests and review code.
- [Fork a project and contribute to it](../user/project/forking_workflow.md) - [Fork a project and contribute to it](../user/project/repository/forking_workflow.md)
- [Create a new merge request](../gitlab-basics/add-merge-request.md) - [Create a new merge request](../gitlab-basics/add-merge-request.md)
- [Automatically close issues from merge requests](../user/project/issues/managing_issues.md#closing-issues-automatically) - [Automatically close issues from merge requests](../user/project/issues/managing_issues.md#closing-issues-automatically)
- [Automatically merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md) - [Automatically merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md)
......
...@@ -6,8 +6,8 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/file_finder.html' ...@@ -6,8 +6,8 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/file_finder.html'
> [Introduced][gh-9889] in GitLab 8.4. > [Introduced][gh-9889] in GitLab 8.4.
The file finder feature allows you to quickly shortcut your way when you are The file finder feature allows you to search for a file in a repository using the
searching for a file in a repository using the GitLab UI. GitLab UI.
You can find the **Find File** button when in the **Files** section of a You can find the **Find File** button when in the **Files** section of a
project. project.
......
...@@ -7,7 +7,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/forking_workflow.html' ...@@ -7,7 +7,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/forking_workflow.html'
Forking a project to your own namespace is useful if you have no write Forking a project to your own namespace is useful if you have no write
access to the project you want to contribute to. If you do have write access to the project you want to contribute to. If you do have write
access or can request it, we recommend working together in the same access or can request it, we recommend working together in the same
repository since it is simpler. See our [GitLab Flow](../../workflow/gitlab_flow.md) repository since it is simpler. See our [GitLab Flow](../../../workflow/gitlab_flow.md)
document more information about using branches to work together. document more information about using branches to work together.
## Creating a fork ## Creating a fork
...@@ -34,7 +34,7 @@ Forking a project is in most cases a two-step process. ...@@ -34,7 +34,7 @@ Forking a project is in most cases a two-step process.
![Path taken error](img/forking_workflow_path_taken_error.png) ![Path taken error](img/forking_workflow_path_taken_error.png)
After the forking is done, you can start working on the newly created After the forking is done, you can start working on the newly created
repository. There, you will have full [Owner](../permissions.md) repository. There, you will have full [Owner](../../permissions.md)
access, so you can set it up as you please. access, so you can set it up as you please.
## Merging upstream ## Merging upstream
...@@ -42,7 +42,7 @@ access, so you can set it up as you please. ...@@ -42,7 +42,7 @@ access, so you can set it up as you please.
Once you are ready to send your code back to the main project, you need Once you are ready to send your code back to the main project, you need
to create a merge request. Choose your forked project's main branch as to create a merge request. Choose your forked project's main branch as
the source and the original project's main branch as the destination and the source and the original project's main branch as the destination and
create the [merge request](merge_requests/index.md). create the [merge request](../merge_requests/index.md).
![Selecting branches](img/forking_workflow_branch_select.png) ![Selecting branches](img/forking_workflow_branch_select.png)
......
...@@ -11,7 +11,8 @@ A repository is part of a [project](../index.md), which has a lot of other featu ...@@ -11,7 +11,8 @@ A repository is part of a [project](../index.md), which has a lot of other featu
## Create a repository ## Create a repository
To create a new repository, all you need to do is To create a new repository, all you need to do is
[create a new project](../../../gitlab-basics/create-project.md). [create a new project](../../../gitlab-basics/create-project.md) or
[fork an existing project](forking_workflow.md).
Once you create a new project, you can add new files via UI Once you create a new project, you can add new files via UI
(read the section below) or via command line. (read the section below) or via command line.
......
...@@ -24,7 +24,7 @@ comments: false ...@@ -24,7 +24,7 @@ comments: false
- [Issue weight](issue_weight.md) **(STARTER)** - [Issue weight](issue_weight.md) **(STARTER)**
- [Notification emails](notifications.md) - [Notification emails](notifications.md)
- [Projects](../user/project/index.md) - [Projects](../user/project/index.md)
- [Project forking workflow](../user/project/forking_workflow.md) - [Project forking workflow](../user/project/repository/forking_workflow.md)
- [Project users](../user/project/members/index.md) - [Project users](../user/project/members/index.md)
- [Protected branches](../user/project/protected_branches.md) - [Protected branches](../user/project/protected_branches.md)
- [Protected tags](../user/project/protected_tags.md) - [Protected tags](../user/project/protected_tags.md)
...@@ -47,7 +47,6 @@ comments: false ...@@ -47,7 +47,6 @@ comments: false
- [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md) **(STARTER)** - [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md) **(STARTER)**
- [Repository mirroring](repository_mirroring.md) **(STARTER)** - [Repository mirroring](repository_mirroring.md) **(STARTER)**
- [Service Desk](../user/project/service_desk.md) **(PREMIUM)** - [Service Desk](../user/project/service_desk.md) **(PREMIUM)**
- [Manage large binaries with Git LFS](../administration/lfs/manage_large_binaries_with_git_lfs.md)
- [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
- [Todos](todos.md) - [Todos](todos.md)
- [Snippets](../user/snippets.md) - [Snippets](../user/snippets.md)
......
--- ---
redirect_to: '../user/project/forking_workflow.md' redirect_to: '../user/project/repository/forking_workflow.md'
--- ---
This document was moved to [another location](../user/project/forking_workflow.md). This document was moved to [another location](../user/project/repository/forking_workflow.md).
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment