Skip to content

Commit

Permalink
Merge pull request sameersbn#2976 from katrinleinweber/fix-typos
Browse files Browse the repository at this point in the history
Fix some typos in docs
  • Loading branch information
sachilles authored Jul 28, 2024
2 parents 362f6a0 + 7fa534a commit 9061ded
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# GitLab-CI Configuration

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.
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.

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

Expand All @@ -9,4 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C
| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance |
| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry |
| `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}` | Password for the registry |
| `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. |
| `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. |
10 changes: 5 additions & 5 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,7 @@ This file only reflects the changes that are made in this image. Please refer to
- gitlab: upgrade CE to v10.4.3

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

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

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

**9.2.0**
- gilab: upgrade to CE v9.2.0
- gitlab: upgrade to CE v9.2.0
- Add flexibility to use versions committed into gitlab-ce

**9.1.4**
Expand Down Expand Up @@ -2019,7 +2019,7 @@ This file only reflects the changes that are made in this image. Please refer to
- added `GITLAB_PAGES_EXTERNAL_HTTPS`
- added `SSL_PAGES_KEY_PATH`
- added `SSL_PAGES_CERT_PATH`
- added nodejs 7.x as core dependencie
- added nodejs 7.x as core dependencies
- added gitlab-pages daemon

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

**7.2.0**
Expand Down
Loading

0 comments on commit 9061ded

Please sign in to comment.