Commit cb3b14bf authored by Evan Read's avatar Evan Read

Merge branch 'docs-whitespace-fixes-2' into 'master'

Remove extra whitespace

See merge request gitlab-org/gitlab!27289
parents b3d19ad9 6f1f1093
...@@ -65,7 +65,7 @@ maximum memory threshold (in bytes) for the Unicorn worker killer by ...@@ -65,7 +65,7 @@ maximum memory threshold (in bytes) for the Unicorn worker killer by
setting the following values `/etc/gitlab/gitlab.rb`: setting the following values `/etc/gitlab/gitlab.rb`:
- For GitLab **12.7** and newer: - For GitLab **12.7** and newer:
```ruby ```ruby
unicorn['worker_memory_limit_min'] = "1024 * 1 << 20" unicorn['worker_memory_limit_min'] = "1024 * 1 << 20"
unicorn['worker_memory_limit_max'] = "1280 * 1 << 20" unicorn['worker_memory_limit_max'] = "1280 * 1 << 20"
......
...@@ -118,10 +118,10 @@ upload packages: ...@@ -118,10 +118,10 @@ upload packages:
#'path_style' => false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'. #'path_style' => false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
} }
``` ```
NOTE: **Note:** NOTE: **Note:**
Some build tools, like Gradle, must make `HEAD` requests to Amazon S3 to pull a dependency’s metadata. The `gitlab_rails['packages_object_store_proxy_download']` property must be set to `true`. Without this setting, GitLab won't act as a proxy to the Amazon S3 service, and will instead return the signed URL. This will cause a `HTTP 403 Forbidden` response, since Amazon S3 expects a signed URL. Some build tools, like Gradle, must make `HEAD` requests to Amazon S3 to pull a dependency’s metadata. The `gitlab_rails['packages_object_store_proxy_download']` property must be set to `true`. Without this setting, GitLab won't act as a proxy to the Amazon S3 service, and will instead return the signed URL. This will cause a `HTTP 403 Forbidden` response, since Amazon S3 expects a signed URL.
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure)
for the changes to take effect. for the changes to take effect.
......
# Here's the script I'll use to demonstrate - it just loops forever: # Here's the script I'll use to demonstrate - it just loops forever:
$ cat test.rb $ cat test.rb
#!/usr/bin/env ruby #!/usr/bin/env ruby
loop do loop do
...@@ -75,7 +75,7 @@ Thread 1 (Thread 0xb74d76c0 (LWP 1343)): ...@@ -75,7 +75,7 @@ Thread 1 (Thread 0xb74d76c0 (LWP 1343)):
at eval.c:5778 at eval.c:5778
#5 rb_call0 (klass=3075304600, recv=3075299660, id=9393, oid=9393, argc=1, argv=0xbf85f490, body=0xb74c85a8, flags=2) #5 rb_call0 (klass=3075304600, recv=3075299660, id=9393, oid=9393, argc=1, argv=0xbf85f490, body=0xb74c85a8, flags=2)
at eval.c:5928 at eval.c:5928
#6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1, #6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1,
self=<optimized out>) at eval.c:6176 self=<optimized out>) at eval.c:6176
#7 0x080651ec in rb_eval (self=3075299660, n=0xb74c4e1c) at eval.c:3521 #7 0x080651ec in rb_eval (self=3075299660, n=0xb74c4e1c) at eval.c:3521
#8 0x0805c31c in rb_yield_0 (val=6, self=3075299660, klass=<optimized out>, flags=0, avalue=0) at eval.c:5095 #8 0x0805c31c in rb_yield_0 (val=6, self=3075299660, klass=<optimized out>, flags=0, avalue=0) at eval.c:5095
...@@ -139,4 +139,4 @@ A debugging session is active. ...@@ -139,4 +139,4 @@ A debugging session is active.
Quit anyway? (y or n) y Quit anyway? (y or n) y
Detaching from program: /opt/vagrant_ruby/bin/ruby, process 1343 Detaching from program: /opt/vagrant_ruby/bin/ruby, process 1343
$ $
...@@ -77,11 +77,11 @@ and they will assist you with any issues you are having. ...@@ -77,11 +77,11 @@ and they will assist you with any issues you are having.
```shell ```shell
kubectl get cronjobs kubectl get cronjobs
``` ```
When one configures [cron-based backups](https://docs.gitlab.com/charts/backup-restore/backup.html#cron-based-backup), When one configures [cron-based backups](https://docs.gitlab.com/charts/backup-restore/backup.html#cron-based-backup),
you will be able to see the new schedule here. Some details about the schedules can be found you will be able to see the new schedule here. Some details about the schedules can be found
in [Running Automated Tasks with a CronJob](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#creating-a-cron-job) in [Running Automated Tasks with a CronJob](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#creating-a-cron-job)
## GitLab-specific Kubernetes information ## GitLab-specific Kubernetes information
- Minimal config that can be used to test a Kubernetes Helm chart can be found - Minimal config that can be used to test a Kubernetes Helm chart can be found
...@@ -167,7 +167,7 @@ and they will assist you with any issues you are having. ...@@ -167,7 +167,7 @@ and they will assist you with any issues you are having.
```shell ```shell
kubectl exec -it <task-runner-pod-name> -- /srv/gitlab/bin/rails dbconsole -p kubectl exec -it <task-runner-pod-name> -- /srv/gitlab/bin/rails dbconsole -p
``` ```
- How to get info about Helm installation status: - How to get info about Helm installation status:
```shell ```shell
......
...@@ -149,12 +149,12 @@ import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper'; ...@@ -149,12 +149,12 @@ import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper';
describe('my component', () => { describe('my component', () => {
let trackingSpy; let trackingSpy;
beforeEach(() => { beforeEach(() => {
const vm = mountComponent(MyComponent); const vm = mountComponent(MyComponent);
trackingSpy = mockTracking('_category_', vm.$el, spyOn); trackingSpy = mockTracking('_category_', vm.$el, spyOn);
}); });
it('tracks an event when toggled', () => { it('tracks an event when toggled', () => {
triggerEvent('a.toggle'); triggerEvent('a.toggle');
......
...@@ -195,17 +195,17 @@ module Gitlab ...@@ -195,17 +195,17 @@ module Gitlab
The [current version history](../user/project/settings/import_export.md) also displays the equivalent GitLab version The [current version history](../user/project/settings/import_export.md) also displays the equivalent GitLab version
and it is useful for knowing which versions won't be compatible between them. and it is useful for knowing which versions won't be compatible between them.
| Exporting GitLab version | Importing GitLab version | | Exporting GitLab version | Importing GitLab version |
| -------------------------- | -------------------------- | | -------------------------- | -------------------------- |
| 11.7 to current | 11.7 to current | | 11.7 to current | 11.7 to current |
| 11.1 to 11.6 | 11.1 to 11.6 | | 11.1 to 11.6 | 11.1 to 11.6 |
| 10.8 to 11.0 | 10.8 to 11.0 | | 10.8 to 11.0 | 10.8 to 11.0 |
| 10.4 to 10.7 | 10.4 to 10.7 | | 10.4 to 10.7 | 10.4 to 10.7 |
| ... | ... | | ... | ... |
| 8.10.3 to 8.11 | 8.10.3 to 8.11 | | 8.10.3 to 8.11 | 8.10.3 to 8.11 |
| 8.10.0 to 8.10.2 | 8.10.0 to 8.10.2 | | 8.10.0 to 8.10.2 | 8.10.0 to 8.10.2 |
| 8.9.5 to 8.9.11 | 8.9.5 to 8.9.11 | | 8.9.5 to 8.9.11 | 8.9.5 to 8.9.11 |
| 8.9.0 to 8.9.4 | 8.9.0 to 8.9.4 | | 8.9.0 to 8.9.4 | 8.9.0 to 8.9.4 |
### When to bump the version up ### When to bump the version up
......
...@@ -278,7 +278,7 @@ and where the `message` repeats the `location` field: ...@@ -278,7 +278,7 @@ and where the `message` repeats the `location` field:
It takes around 50k characters to block for 2 seconds making this a low severity issue." It takes around 50k characters to block for 2 seconds making this a low severity issue."
} }
``` ```
The `description` might explain how the vulnerability works or give context about the exploit. The `description` might explain how the vulnerability works or give context about the exploit.
It should not repeat the other fields of the vulnerability object. It should not repeat the other fields of the vulnerability object.
In particular, the `description` should not repeat the `location` (what is affected) In particular, the `description` should not repeat the `location` (what is affected)
......
...@@ -43,7 +43,7 @@ Subclasses of `AbstractReferenceFilter` generally do not override `#call`; inste ...@@ -43,7 +43,7 @@ Subclasses of `AbstractReferenceFilter` generally do not override `#call`; inste
a minimum implementation of `AbstractReferenceFilter` should define: a minimum implementation of `AbstractReferenceFilter` should define:
- `.reference_type`: The type of domain object. - `.reference_type`: The type of domain object.
This is usually a keyword, and is used to set the `data-reference-type` attribute This is usually a keyword, and is used to set the `data-reference-type` attribute
on the generated link, and is an important part of the interaction with the on the generated link, and is an important part of the interaction with the
corresponding `ReferenceParser` (see below). corresponding `ReferenceParser` (see below).
......
...@@ -543,7 +543,7 @@ If everything looks good, you should be able to reach GitLab in your browser. ...@@ -543,7 +543,7 @@ If everything looks good, you should be able to reach GitLab in your browser.
### Setting up Gitaly ### Setting up Gitaly
CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly HA](https://gitlab.com/groups/gitlab-org/-/epics/842) is released. CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly HA](https://gitlab.com/groups/gitlab-org/-/epics/842) is released.
Gitaly is a service that provides high-level RPC access to Git repositories. Gitaly is a service that provides high-level RPC access to Git repositories.
It should be enabled and configured on a separate EC2 instance in one of the It should be enabled and configured on a separate EC2 instance in one of the
......
...@@ -54,7 +54,7 @@ The way you install the Go indexer depends on your version of GitLab: ...@@ -54,7 +54,7 @@ The way you install the Go indexer depends on your version of GitLab:
### GitLab Omnibus ### GitLab Omnibus
Since GitLab 11.8 the Go indexer is included in GitLab Omnibus. Since GitLab 11.8 the Go indexer is included in GitLab Omnibus.
The former Ruby-based indexer was removed in [GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/6481). The former Ruby-based indexer was removed in [GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/6481).
### From source ### From source
......
...@@ -21,7 +21,7 @@ You accept and agree to the following terms and conditions for Your present and ...@@ -21,7 +21,7 @@ You accept and agree to the following terms and conditions for Your present and
- **Contributions:** - **Contributions:**
You represent that each of Your Contributions is Your original creation. You represent that each of Your Contributions is Your original creation.
Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: (named here)". Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: (named here)".
You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
......
...@@ -389,7 +389,7 @@ To purchase additional minutes for your personal namespace: ...@@ -389,7 +389,7 @@ To purchase additional minutes for your personal namespace:
1. Click your avatar, then go to **Settings > Pipeline quota**. 1. Click your avatar, then go to **Settings > Pipeline quota**.
1. Locate the subscription card that's linked to your personal namespace on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes will be synced to your Group. 1. Locate the subscription card that's linked to your personal namespace on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes will be synced to your Group.
1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Pipeline quota**. 1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Pipeline quota**.
The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month. The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month.
Be aware that: Be aware that:
......
...@@ -253,7 +253,7 @@ In our example we will end up with commit `B`, that introduced bug/error. We hav ...@@ -253,7 +253,7 @@ In our example we will end up with commit `B`, that introduced bug/error. We hav
- Undo changes on a single file or directory from commit `B`, but retain them in the unstaged state: - Undo changes on a single file or directory from commit `B`, but retain them in the unstaged state:
```shell ```shell
git reset commit-B-id <file> git reset commit-B-id <file>
``` ```
- There is one command we also must not forget: **creating a new branch** - There is one command we also must not forget: **creating a new branch**
...@@ -487,8 +487,8 @@ git filter-branch --tree-filter 'rm filename' HEAD ...@@ -487,8 +487,8 @@ git filter-branch --tree-filter 'rm filename' HEAD
Since `git filter-branch` command might be slow on big repositories, there are Since `git filter-branch` command might be slow on big repositories, there are
tools that can use some of Git specifics to enable faster execution of common tools that can use some of Git specifics to enable faster execution of common
tasks (which is exactly what removing sensitive information file is about). tasks (which is exactly what removing sensitive information file is about).
An alternative is the open source community-maintained tool [BFG][bfg-repo-cleaner]. An alternative is the open source community-maintained tool [BFG][bfg-repo-cleaner].
Keep in mind that these tools are faster because they do not provide the same Keep in mind that these tools are faster because they do not provide the same
feature set as `git filter-branch` does, but focus on specific use cases. feature set as `git filter-branch` does, but focus on specific use cases.
## Conclusion ## Conclusion
......
...@@ -19,7 +19,7 @@ Unfortunately, it's not so easy and that workflow won't work. Deleting files in ...@@ -19,7 +19,7 @@ Unfortunately, it's not so easy and that workflow won't work. Deleting files in
a commit doesn't actually reduce the size of the repo since the earlier commits a commit doesn't actually reduce the size of the repo since the earlier commits
and blobs are still around. What you need to do is rewrite history with Git's and blobs are still around. What you need to do is rewrite history with Git's
[`filter-branch` option](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#The-Nuclear-Option:-filter-branch), [`filter-branch` option](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#The-Nuclear-Option:-filter-branch),
or an open source community-maintained tool like the or an open source community-maintained tool like the
[BFG](https://rtyley.github.io/bfg-repo-cleaner/). [BFG](https://rtyley.github.io/bfg-repo-cleaner/).
Note that even with that method, until `git gc` runs on the GitLab side, the Note that even with that method, until `git gc` runs on the GitLab side, the
......
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