Commit 409974e9 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-capitalization-2' into 'master'

Update capitalization in /dev docs

See merge request gitlab-org/gitlab-ce!32189
parents a200715f 9c87a349
This diff is collapsed.
...@@ -174,9 +174,9 @@ Now, every time you create an MR for CE and EE: ...@@ -174,9 +174,9 @@ Now, every time you create an MR for CE and EE:
## How we run the Automatic CE->EE merge at GitLab ## How we run the Automatic CE->EE merge at GitLab
At GitLab, we use the [Merge Train](https://gitlab.com/gitlab-org/merge-train) At GitLab, we use the [Merge Train](https://gitlab.com/gitlab-org/merge-train)
project to keep our [gitlab-ee](https://gitlab.com/gitlab-org/gitlab-ee) project to keep our [GitLab EE](https://gitlab.com/gitlab-org/gitlab-ee)
repository updated with commits from repository updated with commits from
[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-ce). [GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce).
We have a mirror of the [Merge Train](https://gitlab.com/gitlab-org/merge-train) We have a mirror of the [Merge Train](https://gitlab.com/gitlab-org/merge-train)
project [configured](https://ops.gitlab.net/gitlab-org/merge-train) to run an project [configured](https://ops.gitlab.net/gitlab-org/merge-train) to run an
......
...@@ -294,7 +294,7 @@ to migrate you database down and up, which can result in other background ...@@ -294,7 +294,7 @@ to migrate you database down and up, which can result in other background
migrations being called. That means that using `spy` test doubles with migrations being called. That means that using `spy` test doubles with
`have_received` is encouraged, instead of using regular test doubles, because `have_received` is encouraged, instead of using regular test doubles, because
your expectations defined in a `it` block can conflict with what is being your expectations defined in a `it` block can conflict with what is being
called in RSpec hooks. See [gitlab-org/gitlab-ce#35351][issue-rspec-hooks] called in RSpec hooks. See [issue #35351][issue-rspec-hooks]
for more details. for more details.
## Best practices ## Best practices
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
While developing a new feature or modifying an existing one, it is helpful if an While developing a new feature or modifying an existing one, it is helpful if an
installable package (or a docker image) containing those changes is available installable package (or a docker image) containing those changes is available
for testing. For this very purpose, a manual job is provided in the GitLab CI/CD for testing. For this very purpose, a manual job is provided in the GitLab CI/CD
pipeline that can be used to trigger a pipeline in the omnibus-gitlab repository pipeline that can be used to trigger a pipeline in the Omnibus GitLab repository
that will create: that will create:
- A deb package for Ubuntu 16.04, available as a build artifact, and - A deb package for Ubuntu 16.04, available as a build artifact, and
...@@ -12,7 +12,7 @@ that will create: ...@@ -12,7 +12,7 @@ that will create:
(images titled `gitlab-ce` and `gitlab-ee` respectively and image tag is the (images titled `gitlab-ce` and `gitlab-ee` respectively and image tag is the
commit which triggered the pipeline). commit which triggered the pipeline).
When you push a commit to either the gitlab-ce or gitlab-ee project, the When you push a commit to either the GitLab CE or GitLab EE project, the
pipeline for that commit will have a `build-package` manual action you can pipeline for that commit will have a `build-package` manual action you can
trigger. trigger.
...@@ -30,9 +30,9 @@ branch `0-1-stable`, modify the content of `GITALY_SERVER_VERSION` to ...@@ -30,9 +30,9 @@ branch `0-1-stable`, modify the content of `GITALY_SERVER_VERSION` to
`0-1-stable` and push the commit. This will create a manual job that can be `0-1-stable` and push the commit. This will create a manual job that can be
used to trigger the build. used to trigger the build.
## Specifying the branch in omnibus-gitlab repository ## Specifying the branch in Omnibus GitLab repository
In scenarios where a configuration change is to be introduced and omnibus-gitlab In scenarios where a configuration change is to be introduced and Omnibus GitLab
repository already has the necessary changes in a specific branch, you can build repository already has the necessary changes in a specific branch, you can build
a package against that branch through an environment variable named a package against that branch through an environment variable named
`OMNIBUS_BRANCH`. To do this, specify that environment variable with the name of `OMNIBUS_BRANCH`. To do this, specify that environment variable with the name of
......
...@@ -9,7 +9,7 @@ An easy first step is to search for your error in Slack or google "GitLab (my er ...@@ -9,7 +9,7 @@ An easy first step is to search for your error in Slack or google "GitLab (my er
Available `RAILS_ENV` Available `RAILS_ENV`
- `production` (generally not for your main GDK db, but you may need this for e.g. omnibus) - `production` (generally not for your main GDK db, but you may need this for e.g. Omnibus)
- `development` (this is your main GDK db) - `development` (this is your main GDK db)
- `test` (used for tests like rspec) - `test` (used for tests like rspec)
......
...@@ -910,7 +910,7 @@ import bundle from 'ee_else_ce/protected_branches/protected_branches_bundle.js'; ...@@ -910,7 +910,7 @@ import bundle from 'ee_else_ce/protected_branches/protected_branches_bundle.js';
``` ```
See the frontend guide [performance section](fe_guide/performance.md) for See the frontend guide [performance section](fe_guide/performance.md) for
information on managing page-specific javascript within EE. information on managing page-specific JavaScript within EE.
## Vue code in `assets/javascript` ## Vue code in `assets/javascript`
...@@ -1057,7 +1057,7 @@ Here is a workflow to make sure those changes end up backported safely into CE t ...@@ -1057,7 +1057,7 @@ Here is a workflow to make sure those changes end up backported safely into CE t
**Note:** regarding SCSS, make sure the files living outside `/ee/` don't diverge between CE and EE projects. **Note:** regarding SCSS, make sure the files living outside `/ee/` don't diverge between CE and EE projects.
## gitlab-svgs ## GitLab-svgs
Conflicts in `app/assets/images/icons.json` or `app/assets/images/icons.svg` can Conflicts in `app/assets/images/icons.json` or `app/assets/images/icons.svg` can
be resolved simply by regenerating those assets with be resolved simply by regenerating those assets with
......
...@@ -40,9 +40,11 @@ There is no need to install any plugins ...@@ -40,9 +40,11 @@ There is no need to install any plugins
If you're interested on working with the new beta repo indexer, all you need to do is: If you're interested on working with the new beta repo indexer, all you need to do is:
- git clone git@gitlab.com:gitlab-org/gitlab-elasticsearch-indexer.git ```sh
- make git clone git@gitlab.com:gitlab-org/gitlab-elasticsearch-indexer.git
- make install make
make install
```
this adds `gitlab-elasticsearch-indexer` to `$GOPATH/bin`, please make sure that is in your `$PATH`. After that GitLab will find it and you'll be able to enable it in the admin settings area. this adds `gitlab-elasticsearch-indexer` to `$GOPATH/bin`, please make sure that is in your `$PATH`. After that GitLab will find it and you'll be able to enable it in the admin settings area.
...@@ -188,7 +190,7 @@ The global configurations per version are now in the `Elastic::(Version)::Config ...@@ -188,7 +190,7 @@ The global configurations per version are now in the `Elastic::(Version)::Config
NOTE: **Note:** this is not applicable yet as multiple indices functionality is not fully implemented. NOTE: **Note:** this is not applicable yet as multiple indices functionality is not fully implemented.
Folders like `ee/lib/elastic/v12p1` contain snapshots of search logic from different versions. To keep a continuous git history, the latest version lives under `ee/lib/elastic/latest`, but its classes are aliased under an actual version (e.g. `ee/lib/elastic/v12p3`). When referencing these classes, never use the `Latest` namespace directly, but use the actual version (e.g. `V12p3`). Folders like `ee/lib/elastic/v12p1` contain snapshots of search logic from different versions. To keep a continuous Git history, the latest version lives under `ee/lib/elastic/latest`, but its classes are aliased under an actual version (e.g. `ee/lib/elastic/v12p3`). When referencing these classes, never use the `Latest` namespace directly, but use the actual version (e.g. `V12p3`).
The version name basically follows GitLab's release version. If setting is changed in 12.3, we will create a new namespace called `V12p3` (p stands for "point"). Raise an issue if there is a need to name a version differently. The version name basically follows GitLab's release version. If setting is changed in 12.3, we will create a new namespace called `V12p3` (p stands for "point"). Raise an issue if there is a need to name a version differently.
......
...@@ -40,16 +40,14 @@ In particular, note that: ...@@ -40,16 +40,14 @@ In particular, note that:
This is more complicated than is ideal. It makes the query construction more This is more complicated than is ideal. It makes the query construction more
prone to errors (such as prone to errors (such as
[gitlab-org/gitlab-ce#15557](https://gitlab.com/gitlab-org/gitlab-ce/issues/15557)). [issue #15557](https://gitlab.com/gitlab-org/gitlab-ce/issues/15557)).
## Attempt A: WHERE EXISTS ## Attempt A: WHERE EXISTS
### Attempt A1: use multiple subqueries with WHERE EXISTS ### Attempt A1: use multiple subqueries with WHERE EXISTS
In In [issue #37137](https://gitlab.com/gitlab-org/gitlab-ce/issues/37137)
[gitlab-org/gitlab-ce#37137](https://gitlab.com/gitlab-org/gitlab-ce/issues/37137) and its associated [merge request](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14022),
and its associated merge request
[gitlab-org/gitlab-ce!14022](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14022),
we tried to replace the `GROUP BY` with multiple uses of `WHERE EXISTS`. For the we tried to replace the `GROUP BY` with multiple uses of `WHERE EXISTS`. For the
example above, this would give: example above, this would give:
...@@ -81,12 +79,11 @@ it did not improve query performance. ...@@ -81,12 +79,11 @@ it did not improve query performance.
## Attempt B: Denormalize using an array column ## Attempt B: Denormalize using an array column
Having [removed MySQL support in GitLab Having [removed MySQL support in GitLab 12.1](https://about.gitlab.com/2019/06/27/removing-mysql-support/),
12.1](https://about.gitlab.com/2019/06/27/removing-mysql-support/), using using [Postgres's arrays](https://www.postgresql.org/docs/9.6/arrays.html) became more
[Postgres's arrays](https://www.postgresql.org/docs/9.6/arrays.html) became more
tractable as we didn't have to support two databases. We discussed denormalizing tractable as we didn't have to support two databases. We discussed denormalizing
the `label_links` table for querying in the `label_links` table for querying in
[gitlab-org/gitlab-ce#49651](https://gitlab.com/gitlab-org/gitlab-ce/issues/49651), [issue #49651](https://gitlab.com/gitlab-org/gitlab-ce/issues/49651),
with two options: label IDs and titles. with two options: label IDs and titles.
We can think of both of those as array columns on `issues`, `merge_requests`, We can think of both of those as array columns on `issues`, `merge_requests`,
...@@ -150,8 +147,7 @@ WHERE ...@@ -150,8 +147,7 @@ WHERE
label_titles @> ARRAY['Plan', 'backend'] label_titles @> ARRAY['Plan', 'backend']
``` ```
And our [tests in And our [tests in issue #49651](https://gitlab.com/gitlab-org/gitlab-ce/issues/49651#note_188777346)
gitlab-org/gitlab-ce#49651](https://gitlab.com/gitlab-org/gitlab-ce/issues/49651#note_188777346)
showed that this could be fast. showed that this could be fast.
However, at present, the disadvantages outweigh the advantages. However, at present, the disadvantages outweigh the advantages.
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
When adding a new entry to `Gemfile` or upgrading an existing dependency pay When adding a new entry to `Gemfile` or upgrading an existing dependency pay
attention to the following rules. attention to the following rules.
## No gems fetched from git repositories ## No gems fetched from Git repositories
We do not allow gems that are fetched from git repositories. All gems have We do not allow gems that are fetched from Git repositories. All gems have
to be available in the RubyGems index. We want to minimize external build to be available in the RubyGems index. We want to minimize external build
dependencies and build times. dependencies and build times.
......
...@@ -170,7 +170,7 @@ while `pull` requests will continue to be served by the **secondary** node for m ...@@ -170,7 +170,7 @@ while `pull` requests will continue to be served by the **secondary** node for m
HTTPS and SSH requests are handled differently: HTTPS and SSH requests are handled differently:
- With HTTPS, we will give the user a `HTTP 302 Redirect` pointing to the project on the **primary** node. - With HTTPS, we will give the user a `HTTP 302 Redirect` pointing to the project on the **primary** node.
The git client is wise enough to understand that status code and process the redirection. The Git client is wise enough to understand that status code and process the redirection.
- With SSH, because there is no equivalent way to perform a redirect, we have to proxy the request. - With SSH, because there is no equivalent way to perform a redirect, we have to proxy the request.
This is done inside [`gitlab-shell`](https://gitlab.com/gitlab-org/gitlab-shell), by first translating the request This is done inside [`gitlab-shell`](https://gitlab.com/gitlab-org/gitlab-shell), by first translating the request
to the HTTP protocol, and then proxying it to the **primary** node. to the HTTP protocol, and then proxying it to the **primary** node.
......
...@@ -169,7 +169,7 @@ There are three different things that can go wrong here. ...@@ -169,7 +169,7 @@ There are three different things that can go wrong here.
In this case, we miss out on disk space savings but all RPC's on A In this case, we miss out on disk space savings but all RPC's on A
itself will function fine. The next time garbage collection runs on A, itself will function fine. The next time garbage collection runs on A,
the alternates connection gets established in Gitaly. This is done by the alternates connection gets established in Gitaly. This is done by
`Projects::GitDeduplicationService` in gitlab-rails. `Projects::GitDeduplicationService` in GitLab Rails.
#### 2. SQL says repo A belongs to pool P1 but Gitaly says A has alternate objects in pool P2 #### 2. SQL says repo A belongs to pool P1 but Gitaly says A has alternate objects in pool P2
......
...@@ -45,13 +45,13 @@ The process for adding new Gitaly features is: ...@@ -45,13 +45,13 @@ The process for adding new Gitaly features is:
- release a new version of gitaly-proto - release a new version of gitaly-proto
- write implementation and tests for the RPC [in Gitaly](https://gitlab.com/gitlab-org/gitaly), in Go or Ruby - write implementation and tests for the RPC [in Gitaly](https://gitlab.com/gitlab-org/gitaly), in Go or Ruby
- release a new version of Gitaly - release a new version of Gitaly
- write client code in gitlab-ce/ee, gitlab-workhorse or gitlab-shell that calls the new Gitaly RPC - write client code in GitLab CE/EE, GitLab Workhorse or GitLab Shell that calls the new Gitaly RPC
These steps often overlap. It is possible to use an unreleased version These steps often overlap. It is possible to use an unreleased version
of Gitaly and gitaly-proto during testing and development. of Gitaly and gitaly-proto during testing and development.
- See the [Gitaly repo](https://gitlab.com/gitlab-org/gitaly/blob/master/CONTRIBUTING.md#development-and-testing-with-a-custom-gitaly-proto) for instructions on writing server side code with an unreleased protocol. - See the [Gitaly repo](https://gitlab.com/gitlab-org/gitaly/blob/master/CONTRIBUTING.md#development-and-testing-with-a-custom-gitaly-proto) for instructions on writing server side code with an unreleased protocol.
- See [below](#running-tests-with-a-locally-modified-version-of-gitaly) for instructions on running gitlab-ce tests with a modified version of Gitaly. - See [below](#running-tests-with-a-locally-modified-version-of-gitaly) for instructions on running GitLab CE tests with a modified version of Gitaly.
- In GDK run `gdk install` and restart `gdk run` (or `gdk run app`) to use a locally modified Gitaly version for development - In GDK run `gdk install` and restart `gdk run` (or `gdk run app`) to use a locally modified Gitaly version for development
### Gitaly-ruby ### Gitaly-ruby
...@@ -146,7 +146,7 @@ Once the code is wrapped in this block, this code-path will be excluded from n+1 ...@@ -146,7 +146,7 @@ Once the code is wrapped in this block, this code-path will be excluded from n+1
## Request counts ## Request counts
Commits and other git data, is now fetched through Gitaly. These fetches can, Commits and other Git data, is now fetched through Gitaly. These fetches can,
much like with a database, be batched. This improves performance for the client much like with a database, be batched. This improves performance for the client
and for Gitaly itself and therefore for the users too. To keep performance stable and for Gitaly itself and therefore for the users too. To keep performance stable
and guard performance regressions, Gitaly calls can be counted and the call count and guard performance regressions, Gitaly calls can be counted and the call count
...@@ -164,10 +164,10 @@ end ...@@ -164,10 +164,10 @@ end
## Running tests with a locally modified version of Gitaly ## Running tests with a locally modified version of Gitaly
Normally, gitlab-ce/ee tests use a local clone of Gitaly in Normally, GitLab CE/EE tests use a local clone of Gitaly in
`tmp/tests/gitaly` pinned at the version specified in `tmp/tests/gitaly` pinned at the version specified in
`GITALY_SERVER_VERSION`. The `GITALY_SERVER_VERSION` file supports `GITALY_SERVER_VERSION`. The `GITALY_SERVER_VERSION` file supports
`=my-branch` syntax to use a custom branch in gitlab-org/gitaly. If `=my-branch` syntax to use a custom branch in <https://gitlab.com/gitlab-org/gitaly>. If
you want to run tests locally against a modified version of Gitaly you you want to run tests locally against a modified version of Gitaly you
can replace `tmp/tests/gitaly` with a symlink. This is much faster can replace `tmp/tests/gitaly` with a symlink. This is much faster
because the `=my-branch` syntax forces a Gitaly re-install each time because the `=my-branch` syntax forces a Gitaly re-install each time
...@@ -276,9 +276,9 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag. ...@@ -276,9 +276,9 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag.
require.NoError(t, err) require.NoError(t, err)
``` ```
### Gitlab-Rails ### GitLab Rails
1. Add feature flag to `lib/gitlab/gitaly_client.rb` (in gitlab-rails): 1. Add feature flag to `lib/gitlab/gitaly_client.rb` (in GitLab Rails):
```ruby ```ruby
SERVER_FEATURE_FLAGS = %w[go-find-all-tags].freeze SERVER_FEATURE_FLAGS = %w[go-find-all-tags].freeze
......
...@@ -107,7 +107,7 @@ Mitigation strategies include: ...@@ -107,7 +107,7 @@ Mitigation strategies include:
## Debugging ## Debugging
Logs related to the Kubernetes integration can be found in Logs related to the Kubernetes integration can be found in
[kubernetes.log](../administration/logs.md#kuberneteslog). On a local [`kubernetes.log`](../administration/logs.md#kuberneteslog). On a local
GDK install, this will be present in `log/kubernetes.log`. GDK install, this will be present in `log/kubernetes.log`.
Some services such as Some services such as
......
...@@ -133,7 +133,7 @@ importer progresses. Here's what to do: ...@@ -133,7 +133,7 @@ importer progresses. Here's what to do:
logs in `/var/log/gitlab/gitlab-rails/*.log` every hour and [keep at logs in `/var/log/gitlab/gitlab-rails/*.log` every hour and [keep at
most 30 compressed files](https://docs.gitlab.com/omnibus/settings/logs.html#logrotate). most 30 compressed files](https://docs.gitlab.com/omnibus/settings/logs.html#logrotate).
On GitLab.com, that setting is only 6 compressed files. These settings should suffice On GitLab.com, that setting is only 6 compressed files. These settings should suffice
for most users, but you may need to tweak them in [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab). for most users, but you may need to tweak them in [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab).
1. If you add a new file, submit an issue to the [production 1. If you add a new file, submit an issue to the [production
tracker](https://gitlab.com/gitlab-com/gl-infra/production/issues) or tracker](https://gitlab.com/gitlab-com/gl-infra/production/issues) or
......
# What you should know about omnibus packages # What you should know about Omnibus packages
Most users install GitLab using our omnibus packages. As a developer it can be Most users install GitLab using our Omnibus packages. As a developer it can be
good to know how the omnibus packages differ from what you have on your laptop good to know how the Omnibus packages differ from what you have on your laptop
when you are coding. when you are coding.
## Files are owned by root by default ## Files are owned by root by default
All the files in the Rails tree (`app/`, `config/` etc.) are owned by 'root' in All the files in the Rails tree (`app/`, `config/` etc.) are owned by `root` in
omnibus installations. This makes the installation simpler and it provides Omnibus installations. This makes the installation simpler and it provides
extra security. The omnibus reconfigure script contains commands that give extra security. The Omnibus reconfigure script contains commands that give
write access to the 'git' user only where needed. write access to the `git` user only where needed.
For example, the 'git' user is allowed to write in the `log/` directory, in For example, the `git` user is allowed to write in the `log/` directory, in
`public/uploads`, and they are allowed to rewrite the `db/schema.rb` file. `public/uploads`, and they are allowed to rewrite the `db/schema.rb` file.
In other cases, the reconfigure script tricks GitLab into not trying to write a In other cases, the reconfigure script tricks GitLab into not trying to write a
file. For instance, GitLab will generate a `.secret` file if it cannot find one file. For instance, GitLab will generate a `.secret` file if it cannot find one
and write it to the Rails root. In the omnibus packages, reconfigure writes the and write it to the Rails root. In the Omnibus packages, reconfigure writes the
`.secret` file first, so that GitLab never tries to write it. `.secret` file first, so that GitLab never tries to write it.
## Code, data and logs are in separate directories ## Code, data and logs are in separate directories
The omnibus design separates code (read-only, under `/opt/gitlab`) from data The Omnibus design separates code (read-only, under `/opt/gitlab`) from data
(read/write, under `/var/opt/gitlab`) and logs (read/write, under (read/write, under `/var/opt/gitlab`) and logs (read/write, under
`/var/log/gitlab`). To make this happen the reconfigure script sets custom `/var/log/gitlab`). To make this happen the reconfigure script sets custom
paths where it can in GitLab config files, and where there are no path paths where it can in GitLab config files, and where there are no path
settings, it uses symlinks. settings, it uses symlinks.
For example, `config/gitlab.yml` is treated as data so that file is a symlink. For example, `config/gitlab.yml` is treated as data so that file is a symlink.
The same goes for `public/uploads`. The `log/` directory is replaced by omnibus The same goes for `public/uploads`. The `log/` directory is replaced by Omnibus
with a symlink to `/var/log/gitlab/gitlab-rails`. with a symlink to `/var/log/gitlab/gitlab-rails`.
...@@ -17,7 +17,7 @@ When storing values in a session it is best to: ...@@ -17,7 +17,7 @@ When storing values in a session it is best to:
- Use simple primitives and avoid storing objects to avoid marshaling complications. - Use simple primitives and avoid storing objects to avoid marshaling complications.
- Clean up after unneeded variables to keep memory usage in Redis down. - Clean up after unneeded variables to keep memory usage in Redis down.
## Gitlab::Session ## GitLab::Session
Sometimes you might want to persist data in the session instead of another store like the database. `Gitlab::Session` lets you access this without passing the session around extensively. For example, you could access it from within a policy without having to pass the session through to each place permissions are checked from. Sometimes you might want to persist data in the session instead of another store like the database. `Gitlab::Session` lets you access this without passing the session around extensively. For example, you could access it from within a policy without having to pass the session through to each place permissions are checked from.
......
...@@ -35,7 +35,7 @@ Gitlab::Popen.popen(%W(find /some/path -not -path /some/path -mmin +120 -delete) ...@@ -35,7 +35,7 @@ Gitlab::Popen.popen(%W(find /some/path -not -path /some/path -mmin +120 -delete)
This coding style could have prevented CVE-2013-4490. This coding style could have prevented CVE-2013-4490.
## Always use the configurable git binary path for git commands ## Always use the configurable Git binary path for Git commands
```ruby ```ruby
# Wrong # Wrong
...@@ -114,7 +114,7 @@ user = `whoami` ...@@ -114,7 +114,7 @@ user = `whoami`
user, exit_status = Gitlab::Popen.popen(%W(whoami)) user, exit_status = Gitlab::Popen.popen(%W(whoami))
``` ```
In other repositories, such as gitlab-shell you can also use `IO.popen`. In other repositories, such as GitLab Shell you can also use `IO.popen`.
```ruby ```ruby
# Safe IO.popen example # Safe IO.popen example
......
...@@ -70,7 +70,7 @@ git commit -m "DESCRIBE COMMIT IN A FEW WORDS" ...@@ -70,7 +70,7 @@ git commit -m "DESCRIBE COMMIT IN A FEW WORDS"
``` ```
Now you can push (send) your changes (in the branch `<branch-name>`) to GitLab Now you can push (send) your changes (in the branch `<branch-name>`) to GitLab
(the git remote named 'origin'): (the Git remote named 'origin'):
```sh ```sh
git push origin <branch-name> git push origin <branch-name>
......
...@@ -10,7 +10,7 @@ learn, in order to make full use of the command line. ...@@ -10,7 +10,7 @@ learn, in order to make full use of the command line.
## Start working on your project ## Start working on your project
To work on a git project locally (from your own computer), with the command line, To work on a Git project locally (from your own computer), with the command line,
first you will need to [clone (copy) it](start-using-git.md#clone-a-repository) to first you will need to [clone (copy) it](start-using-git.md#clone-a-repository) to
your computer. your computer.
......
...@@ -13,7 +13,7 @@ and cost of hosting. ...@@ -13,7 +13,7 @@ and cost of hosting.
There are many ways you can install GitLab depending on your platform: There are many ways you can install GitLab depending on your platform:
1. **Omnibus Gitlab**: The official deb/rpm packages that contain a bundle of GitLab 1. **Omnibus GitLab**: The official deb/rpm packages that contain a bundle of GitLab
and the various components it depends on like PostgreSQL, Redis, Sidekiq, etc. and the various components it depends on like PostgreSQL, Redis, Sidekiq, etc.
1. **GitLab Helm chart**: The cloud native Helm chart for installing GitLab and all 1. **GitLab Helm chart**: The cloud native Helm chart for installing GitLab and all
its components on Kubernetes. its components on Kubernetes.
......
...@@ -57,18 +57,18 @@ of this page: ...@@ -57,18 +57,18 @@ of this page:
``` ```
- `/home/git/.ssh` - Contains OpenSSH settings. Specifically the `authorized_keys` - `/home/git/.ssh` - Contains OpenSSH settings. Specifically the `authorized_keys`
file managed by gitlab-shell. file managed by GitLab Shell.
- `/home/git/gitlab` - GitLab core software. - `/home/git/gitlab` - GitLab core software.
- `/home/git/gitlab-shell` - Core add-on component of GitLab. Maintains SSH - `/home/git/gitlab-shell` - Core add-on component of GitLab. Maintains SSH
cloning and other functionality. cloning and other functionality.
- `/home/git/repositories` - Bare repositories for all projects organized by - `/home/git/repositories` - Bare repositories for all projects organized by
namespace. This is where the git repositories which are pushed/pulled are namespace. This is where the Git repositories which are pushed/pulled are
maintained for all projects. **This area contains critical data for projects. maintained for all projects. **This area contains critical data for projects.
[Keep a backup](../raketasks/backup_restore.md).** [Keep a backup](../raketasks/backup_restore.md).**
NOTE: **Note:** NOTE: **Note:**
The default locations for repositories can be configured in `config/gitlab.yml` The default locations for repositories can be configured in `config/gitlab.yml`
of GitLab and `config.yml` of gitlab-shell. of GitLab and `config.yml` of GitLab Shell.
For a more in-depth overview, see the [GitLab architecture doc](../development/architecture.md). For a more in-depth overview, see the [GitLab architecture doc](../development/architecture.md).
...@@ -569,7 +569,7 @@ GitLab Shell application startup time can be greatly reduced by disabling RubyGe ...@@ -569,7 +569,7 @@ GitLab Shell application startup time can be greatly reduced by disabling RubyGe
- Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommended for system-wide Ruby. - Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommended for system-wide Ruby.
- Omnibus GitLab [replaces the *shebang* line of the `gitlab-shell/bin/*` scripts](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707). - Omnibus GitLab [replaces the *shebang* line of the `gitlab-shell/bin/*` scripts](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707).
### Install gitlab-workhorse ### Install GitLab Workhorse
GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). The GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). The
following command-line will install GitLab-Workhorse in `/home/git/gitlab-workhorse` following command-line will install GitLab-Workhorse in `/home/git/gitlab-workhorse`
...@@ -833,7 +833,7 @@ To use GitLab with HTTPS: ...@@ -833,7 +833,7 @@ To use GitLab with HTTPS:
1. In `gitlab.yml`: 1. In `gitlab.yml`:
1. Set the `port` option in section 1 to `443`. 1. Set the `port` option in section 1 to `443`.
1. Set the `https` option in section 1 to `true`. 1. Set the `https` option in section 1 to `true`.
1. In the `config.yml` of gitlab-shell: 1. In the `config.yml` of GitLab Shell:
1. Set `gitlab_url` option to the HTTPS endpoint of GitLab (e.g. `https://git.example.com`). 1. Set `gitlab_url` option to the HTTPS endpoint of GitLab (e.g. `https://git.example.com`).
1. Set the certificates using either the `ca_file` or `ca_path` option. 1. Set the certificates using either the `ca_file` or `ca_path` option.
1. Use the `gitlab-ssl` Nginx example config instead of the `gitlab` config. 1. Use the `gitlab-ssl` Nginx example config instead of the `gitlab` config.
...@@ -852,7 +852,7 @@ Using a self-signed certificate is discouraged but if you must use it, follow th ...@@ -852,7 +852,7 @@ Using a self-signed certificate is discouraged but if you must use it, follow th
sudo chmod o-r gitlab.key sudo chmod o-r gitlab.key
``` ```
1. In the `config.yml` of gitlab-shell set `self_signed_cert` to `true`. 1. In the `config.yml` of GitLab Shell set `self_signed_cert` to `true`.
### Enable Reply by email ### Enable Reply by email
...@@ -950,8 +950,8 @@ To use GitLab with Puma: ...@@ -950,8 +950,8 @@ To use GitLab with Puma:
If you see this message when attempting to clone a repository hosted by GitLab, If you see this message when attempting to clone a repository hosted by GitLab,
this is likely due to an outdated Nginx or Apache configuration, or a missing or this is likely due to an outdated Nginx or Apache configuration, or a missing or
misconfigured gitlab-workhorse instance. Double-check that you've misconfigured GitLab Workhorse instance. Double-check that you've
[installed Go](#3-go), [installed gitlab-workhorse](#install-gitlab-workhorse), [installed Go](#3-go), [installed GitLab Workhorse](#install-gitlab-workhorse),
and correctly [configured Nginx](#site-configuration). and correctly [configured Nginx](#site-configuration).
### google-protobuf "LoadError: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.14' not found" ### google-protobuf "LoadError: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.14' not found"
......
...@@ -110,7 +110,7 @@ Make sure to follow all steps below: ...@@ -110,7 +110,7 @@ Make sure to follow all steps below:
**Note:** **Note:**
If you are using a custom init script, make sure to edit the above If you are using a custom init script, make sure to edit the above
gitlab-workhorse setting as needed. GitLab Workhorse setting as needed.
1. [Restart GitLab][] for the changes to take effect. 1. [Restart GitLab][] for the changes to take effect.
......
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