Commit 5fb7fc01 authored by Marcel Amirault's avatar Marcel Amirault

Fix more EOL whitespace

parent a7ea824a
...@@ -184,5 +184,4 @@ The following are additional validation tests we performed. ...@@ -184,5 +184,4 @@ The following are additional validation tests we performed.
[Test Gitaly Cluster on a Geo Deployment](https://gitlab.com/gitlab-org/gitlab/-/issues/223210): [Test Gitaly Cluster on a Geo Deployment](https://gitlab.com/gitlab-org/gitlab/-/issues/223210):
- Description: Tested a Geo deployment with Gitaly clusters configured on both the primary and secondary Geo sites. Triggered automatic Gitaly cluster failover on the primary Geo site, and ran end-to-end Geo tests. Then triggered Gitaly cluster failover on the secondary Geo site, and re-ran the end-to-end Geo tests. - Description: Tested a Geo deployment with Gitaly clusters configured on both the primary and secondary Geo sites. Triggered automatic Gitaly cluster failover on the primary Geo site, and ran end-to-end Geo tests. Then triggered Gitaly cluster failover on the secondary Geo site, and re-ran the end-to-end Geo tests.
- Outcome: Successful end-to-end tests before and after Gitaly cluster failover on the primary site, and before and after Gitaly cluster failover on the secondary site. - Outcome: Successful end-to-end tests before and after Gitaly cluster failover on the primary site, and before and after Gitaly cluster failover on the secondary site.
...@@ -160,7 +160,7 @@ Projects::HousekeepingService.new(p, :gc).execute ...@@ -160,7 +160,7 @@ Projects::HousekeepingService.new(p, :gc).execute
`gitlab-rake gitlab:uploads:check VERBOSE=1` detects remote objects that do not exist because they were `gitlab-rake gitlab:uploads:check VERBOSE=1` detects remote objects that do not exist because they were
deleted externally but their references still exist in the GitLab database. deleted externally but their references still exist in the GitLab database.
Example output with error message: Example output with error message:
```shell ```shell
$ sudo gitlab-rake gitlab:uploads:check VERBOSE=1 $ sudo gitlab-rake gitlab:uploads:check VERBOSE=1
......
...@@ -24,7 +24,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a ...@@ -24,7 +24,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
``` ```
```json ```json
[ [
{ {
"id": 4, "id": 4,
"name": "Test Token", "name": "Test Token",
...@@ -45,7 +45,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a ...@@ -45,7 +45,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
``` ```
```json ```json
[ [
{ {
"id": 4, "id": 4,
"name": "Test Token", "name": "Test Token",
......
...@@ -57,7 +57,7 @@ of using this type instead of `ID` are: ...@@ -57,7 +57,7 @@ of using this type instead of `ID` are:
- it parses it into a `GlobalID` before passing it to user code - it parses it into a `GlobalID` before passing it to user code
- it can be parameterized on the type of the object (e.g. - it can be parameterized on the type of the object (e.g.
`GlobalIDType[Project]`) which offers even better validation and security. `GlobalIDType[Project]`) which offers even better validation and security.
Consider using this type for all new arguments and result types. Remember that Consider using this type for all new arguments and result types. Remember that
it is perfectly possible to parameterize this type with a concern or a it is perfectly possible to parameterize this type with a concern or a
supertype, if you want to accept a wider range of objects (e.g. supertype, if you want to accept a wider range of objects (e.g.
......
...@@ -171,7 +171,7 @@ class ParentPolicy < BasePolicy ...@@ -171,7 +171,7 @@ class ParentPolicy < BasePolicy
condition(:speaks_spanish) { @subject.spoken_languages.include?(:es) } condition(:speaks_spanish) { @subject.spoken_languages.include?(:es) }
condition(:has_license) { @subject.driving_license.present? } condition(:has_license) { @subject.driving_license.present? }
condition(:enjoys_broccoli) { @subject.enjoyment_of(:broccoli) > 0 } condition(:enjoys_broccoli) { @subject.enjoyment_of(:broccoli) > 0 }
rule { speaks_spanish }.enable :read_spanish rule { speaks_spanish }.enable :read_spanish
rule { has_license }.enable :drive_car rule { has_license }.enable :drive_car
rule { enjoys_broccoli }.enable :eat_broccoli rule { enjoys_broccoli }.enable :eat_broccoli
...@@ -190,7 +190,7 @@ child policy, for example: ...@@ -190,7 +190,7 @@ child policy, for example:
```ruby ```ruby
class ChildPolicy < BasePolicy class ChildPolicy < BasePolicy
delegate { @subject.parent } delegate { @subject.parent }
rule { default }.prevent :drive_car rule { default }.prevent :drive_car
end end
``` ```
...@@ -211,11 +211,11 @@ The solution it to override the `:eat_broccoli` ability in the child policy: ...@@ -211,11 +211,11 @@ The solution it to override the `:eat_broccoli` ability in the child policy:
```ruby ```ruby
class ChildPolicy < BasePolicy class ChildPolicy < BasePolicy
delegate { @subject.parent } delegate { @subject.parent }
overrides :eat_broccoli overrides :eat_broccoli
condition(:good_kid) { @subject.behavior_level >= Child::GOOD } condition(:good_kid) { @subject.behavior_level >= Child::GOOD }
rule { good_kid }.enable :eat_broccoli rule { good_kid }.enable :eat_broccoli
end end
``` ```
......
...@@ -240,7 +240,7 @@ end ...@@ -240,7 +240,7 @@ end
it 'schedules a background job' do it 'schedules a background job' do
expect(BackgroundJob).to receive(:perform_async) expect(BackgroundJob).to receive(:perform_async)
subject.execute subject.execute
end end
``` ```
...@@ -252,7 +252,7 @@ combining the examples: ...@@ -252,7 +252,7 @@ combining the examples:
```ruby ```ruby
it 'performs the expected side-effects' do it 'performs the expected side-effects' do
expect(BackgroundJob).to receive(:perform_async) expect(BackgroundJob).to receive(:perform_async)
expect { subject.execute } expect { subject.execute }
.to change(Event, :count).by(1) .to change(Event, :count).by(1)
.and change { arg_0.frobulance }.to('wibble') .and change { arg_0.frobulance }.to('wibble')
......
...@@ -13,7 +13,7 @@ what environments to run tests against using the `only` metadata. ...@@ -13,7 +13,7 @@ what environments to run tests against using the `only` metadata.
| `production` | Match against production | `Static` | | `production` | Match against production | `Static` |
CAUTION: **Caution:** CAUTION: **Caution:**
You cannot specify `:production` and `{ <switch>: 'value' }` simultaneously. You cannot specify `:production` and `{ <switch>: 'value' }` simultaneously.
These options are mutually exclusive. If you want to specify production, you These options are mutually exclusive. If you want to specify production, you
can control the `tld` and `domain` independently. can control the `tld` and `domain` independently.
......
...@@ -229,7 +229,7 @@ beforeEach(() => { ...@@ -229,7 +229,7 @@ beforeEach(() => {
it('exists', () => { it('exists', () => {
// Best // Best
// NOTE: both mount and shallowMount work as long as a DOM element is available // NOTE: both mount and shallowMount work as long as a DOM element is available
// Finds a properly formatted link with an accessible name of "Click Me" // Finds a properly formatted link with an accessible name of "Click Me"
getByRole(el, 'link', { name: /Click Me/i }) getByRole(el, 'link', { name: /Click Me/i })
getByRole(el, 'link', { name: 'Click Me' }) getByRole(el, 'link', { name: 'Click Me' })
......
...@@ -79,7 +79,7 @@ test: ...@@ -79,7 +79,7 @@ test:
The following [`gitlab-ci.yml`](../../../ci/yaml/README.md) example for Java uses [Maven](https://maven.apache.org/) The following [`gitlab-ci.yml`](../../../ci/yaml/README.md) example for Java uses [Maven](https://maven.apache.org/)
to build the project and [Jacoco](https://www.eclemma.org/jacoco/) coverage-tooling to to build the project and [Jacoco](https://www.eclemma.org/jacoco/) coverage-tooling to
generate the coverage artifact. generate the coverage artifact.
You can check the [Docker image configuration and scripts](https://gitlab.com/haynes/jacoco2cobertura) if you want to build your own image. You can check the [Docker image configuration and scripts](https://gitlab.com/haynes/jacoco2cobertura) if you want to build your own image.
GitLab expects the artifact in the Cobertura format, so you have to execute a few GitLab expects the artifact in the Cobertura format, so you have to execute a few
...@@ -119,7 +119,7 @@ coverage-jdk11: ...@@ -119,7 +119,7 @@ coverage-jdk11:
The following [`gitlab-ci.yml`](../../../ci/yaml/README.md) example for Java uses [Gradle](https://gradle.org/) The following [`gitlab-ci.yml`](../../../ci/yaml/README.md) example for Java uses [Gradle](https://gradle.org/)
to build the project and [Jacoco](https://www.eclemma.org/jacoco/) coverage-tooling to to build the project and [Jacoco](https://www.eclemma.org/jacoco/) coverage-tooling to
generate the coverage artifact. generate the coverage artifact.
You can check the [Docker image configuration and scripts](https://gitlab.com/haynes/jacoco2cobertura) if you want to build your own image. You can check the [Docker image configuration and scripts](https://gitlab.com/haynes/jacoco2cobertura) if you want to build your own image.
GitLab expects the artifact in the Cobertura format, so you have to execute a few GitLab expects the artifact in the Cobertura format, so you have to execute a few
......
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