Skip to content

Commit 9061ded

Browse files
authored
Merge pull request #2976 from katrinleinweber/fix-typos
Fix some typos in docs
2 parents 362f6a0 + 7fa534a commit 9061ded

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# GitLab-CI Configuration
22

3-
When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the GitLab Instance. If needed several options can be overriden.
3+
When using your own GitLab instance, the provided .gitlab-ci.yml will automatically be using the settings provided by the GitLab instance. If needed, several options can be overriden.
44

55
Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
66

@@ -9,4 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C
99
| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance |
1010
| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry |
1111
| `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}` | Password for the registry |
12-
| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |
12+
| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will cause the image to be uploaded to the local registry of the project within GitLab. |

Changelog.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ This file only reflects the changes that are made in this image. Please refer to
17541754
- gitlab: upgrade CE to v10.4.3
17551755

17561756
**10.4.2-1**
1757-
- FIXED SSH Host Key generation through droping the support for rsa1
1757+
- FIXED SSH Host Key generation through dropping the support for rsa1
17581758

17591759
**10.4.2**
17601760
- gitlab: upgrade CE to v10.4.2
@@ -1888,7 +1888,7 @@ This file only reflects the changes that are made in this image. Please refer to
18881888
**9.4.0**
18891889
- gitlab: upgrade to CE v9.4.0
18901890
- Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137))
1891-
- Added more security for regenarting certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
1891+
- Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
18921892

18931893
**9.3.9**
18941894
- gitlab: upgrade to CE v9.3.9
@@ -1946,7 +1946,7 @@ This file only reflects the changes that are made in this image. Please refer to
19461946
- gitlab: upgrade to CE v9.2.1
19471947

19481948
**9.2.0**
1949-
- gilab: upgrade to CE v9.2.0
1949+
- gitlab: upgrade to CE v9.2.0
19501950
- Add flexibility to use versions committed into gitlab-ce
19511951

19521952
**9.1.4**
@@ -2019,7 +2019,7 @@ This file only reflects the changes that are made in this image. Please refer to
20192019
- added `GITLAB_PAGES_EXTERNAL_HTTPS`
20202020
- added `SSL_PAGES_KEY_PATH`
20212021
- added `SSL_PAGES_CERT_PATH`
2022-
- added nodejs 7.x as core dependencie
2022+
- added nodejs 7.x as core dependencies
20232023
- added gitlab-pages daemon
20242024

20252025
**8.16.6**
@@ -2706,7 +2706,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
27062706
**7.2.0-1**
27072707
- fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used.
27082708
- fix relative root access without the trailing '/' character
2709-
- added seperate server block for http config in gitlab.https.permissive. Fixes #127
2709+
- added separate server block for http config in gitlab.https.permissive. Fixes #127
27102710
- added OAUTH_GOOGLE_RESTRICT_DOMAIN config option.
27112711

27122712
**7.2.0**

0 commit comments

Comments
 (0)