Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
180d1bb1
Commit
180d1bb1
authored
Apr 05, 2021
by
Mike Jang
Committed by
Craig Norris
Apr 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Language change, Manage docs: Convert master to default (mostly)
parent
9eec48b6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
27 deletions
+28
-27
doc/development/i18n/externalization.md
doc/development/i18n/externalization.md
+2
-2
doc/development/i18n/merging_translations.md
doc/development/i18n/merging_translations.md
+6
-5
doc/user/project/import/perforce.md
doc/user/project/import/perforce.md
+20
-20
No files found.
doc/development/i18n/externalization.md
View file @
180d1bb1
...
@@ -699,7 +699,7 @@ bin/rake gettext:regenerate
...
@@ -699,7 +699,7 @@ bin/rake gettext:regenerate
This command updates
`locale/gitlab.pot`
file with the newly externalized
This command updates
`locale/gitlab.pot`
file with the newly externalized
strings and remove any strings that aren't used anymore. You should check this
strings and remove any strings that aren't used anymore. You should check this
file in. Once the changes are on
master
, they are picked up by
file in. Once the changes are on
the default branch
, they are picked up by
[
CrowdIn
](
https://translate.gitlab.com
)
and be presented for
[
CrowdIn
](
https://translate.gitlab.com
)
and be presented for
translation.
translation.
...
...
doc/development/i18n/merging_translations.md
View file @
180d1bb1
...
@@ -42,10 +42,11 @@ page](https://translate.gitlab.com/project/gitlab-ee/settings#integration).
...
@@ -42,10 +42,11 @@ page](https://translate.gitlab.com/project/gitlab-ee/settings#integration).
## Merging translations
## Merging translations
When all translations are found good and pipelines pass the
After all translations are determined to be appropriate and the pipelines pass,
translations can be merged into the master branch. When merging the translations,
you can merge the translations into the default branch. When merging translations,
make sure to check the
**Remove source branch**
checkbox, so CrowdIn recreates the
be sure to select the
**Remove source branch**
check box, which causes CrowdIn
`master-i18n`
from master after the new translation was merged.
to recreate the
`master-i18n`
from the default branch after merging the new
translation.
We are discussing
[
automating this entire process
](
https://gitlab.com/gitlab-org/gitlab/-/issues/19896
)
.
We are discussing
[
automating this entire process
](
https://gitlab.com/gitlab-org/gitlab/-/issues/19896
)
.
...
@@ -59,7 +60,7 @@ and delete the
...
@@ -59,7 +60,7 @@ and delete the
[
`master-18n`
](
https://gitlab.com/gitlab-org/gitlab/-/branches/all?utf8=✓&search=master-i18n
)
.
[
`master-18n`
](
https://gitlab.com/gitlab-org/gitlab/-/branches/all?utf8=✓&search=master-i18n
)
.
This might be needed when the merge request contains failures that
This might be needed when the merge request contains failures that
have been fixed on
master
.
have been fixed on
the default branch
.
## Recreate the GitLab integration in CrowdIn
## Recreate the GitLab integration in CrowdIn
...
...
doc/user/project/import/perforce.md
View file @
180d1bb1
...
@@ -15,33 +15,33 @@ include a centralized, proprietary version control system similar to Git.
...
@@ -15,33 +15,33 @@ include a centralized, proprietary version control system similar to Git.
The following list illustrates the main differences between Perforce Helix and
The following list illustrates the main differences between Perforce Helix and
Git:
Git:
1.
In general
the biggest difference is that Perforce branching is heavyweight
-
In general,
the biggest difference is that Perforce branching is heavyweight
compared to Git's lightweight branching. When you create a branch in Perforce,
compared to Git's lightweight branching. When you create a branch in Perforce,
it creates an integration record in their proprietary database for every file
it creates an integration record in their proprietary database for every file
in the branch, regardless how many were actually changed. Whereas Git was
in the branch, regardless how many were actually changed. With Git, however,
implemented with a different architecture so that a single SHA acts as a pointer
a single SHA acts as a pointer to the state of the whole repository after the
to the state of the whole repository after the changes, making it very easy to branch
.
changes, which can be helpful when adopting feature branching workflows
.
This is what made feature branching workflows so easy to adopt with Git.
-
Context switching between branches is less complex in Git. If your manager
1.
Also, context switching between branches is much easier in Git. If your manager
says, 'You need to stop work on that new feature and fix this security
said 'You need to stop work on that new feature and fix this security
vulnerability,' Git can help you do this.
vulnerability' you can do so very easily in Git.
-
Having a complete copy of the project and its history on your local computer
1.
Having a complete copy of the project and its history on your local machine
means every transaction is very fast, and Git provides that. You can branch
means every transaction is very fast and Git provides that. You can branch/merge
or merge, and experiment in isolation, and then clean up before sharing your
and experiment in isolation, then clean up your mess before sharing your new
changes with others.
cool stuff with everyone.
-
Git makes code review less complex, because you can share your changes without
1.
Git also made code review simple because you could share your changes without
merging them to the default branch. This is compared to Perforce, which had to
merging them to master, whereas Perforce had to implement a Shelving feature on
implement a Shelving feature on the server so others could review changes
the server so others could review changes
before merging.
before merging.
## Why migrate
## Why migrate
Perforce Helix can be difficult to manage both from a user and an administrator
Perforce Helix can be difficult to manage both from a user and an administrator
perspective. Migrating to Git/GitLab there is:
perspective. Migrating to Git/GitLab there is:
-
**No licensing costs**
,
Git is GPL while Perforce Helix is proprietary.
-
**No licensing costs**
:
Git is GPL while Perforce Helix is proprietary.
-
**Shorter learning curve**
,
Git has a big community and a vast number of
-
**Shorter learning curve**
:
Git has a big community and a vast number of
tutorials to get you started.
tutorials to get you started.
-
**Integration with modern tools**
, migrating to Git and GitLab
you can have
-
**Integration with modern tools**
: By migrating to Git and GitLab,
you can have
an open source end-to-end software development platform with built-in version
an open source end-to-end software development platform with built-in version
control, issue tracking, code review, CI/CD, and more.
control, issue tracking, code review, CI/CD, and more.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment