diff options
| author | Evan Read <eread@gitlab.com> | 2018-11-19 03:05:12 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2018-11-19 03:05:12 +0000 |
| commit | 3791f7bf7599068edec538009dbbb1e11c0ebe0c (patch) | |
| tree | 8f9cd1634159f84c586d1338e94562f2b00618e6 /doc/development | |
| parent | 44e44f6c30e9b9d82af6b0ab80f6f66589b1e6ad (diff) | |
| parent | d2d8b935e2aee96e534543141d2f0beb449b7d79 (diff) | |
| download | gitlab-ce-3791f7bf7599068edec538009dbbb1e11c0ebe0c.tar.gz | |
Merge branch 'gt-fix-typos-in-specs-and-docs' into 'master'
Fix typos in specs and docs
See merge request gitlab-org/gitlab-ce!23084
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/feature_flags.md | 2 | ||||
| -rw-r--r-- | doc/development/testing_guide/review_apps.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/feature_flags.md b/doc/development/feature_flags.md index 350593cc813..1019a1fd0e2 100644 --- a/doc/development/feature_flags.md +++ b/doc/development/feature_flags.md @@ -33,7 +33,7 @@ You can follow the progress on that [in the issue on our issue tracker](https:// In general, it's better to have a group- or user-based gate, and you should prefer it over the use of percentage gates. This would make debugging easier, as you -filter for example logs and errors based on actors too. Futhermore, this allows +filter for example logs and errors based on actors too. Furthermore, this allows for enabling for the `gitlab-org` group first, while the rest of the users aren't impacted. diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md index 36d150c8a5b..1830641431e 100644 --- a/doc/development/testing_guide/review_apps.md +++ b/doc/development/testing_guide/review_apps.md @@ -24,7 +24,7 @@ Review Apps are automatically deployed by each pipeline, both in [`scripts/review_apps/review-apps.sh`][review-apps.sh] - These scripts are basically [our official Auto DevOps scripts][Auto-DevOps.gitlab-ci.yml] where the - default CNG images are overriden with the images built and stored in the + default CNG images are overridden with the images built and stored in the [`CNG-mirror` project's registry][cng-mirror-registry]. - Since we're using [the official GitLab Helm chart][helm-chart], this means you get a dedicated environment for your branch that's very close to what it @@ -33,7 +33,7 @@ Review Apps are automatically deployed by each pipeline, both in thanks to the direct link to it from the MR widget. The default username is `root` and its password can be found in the 1Password secure note named **gitlab-{ce,ee} Review App's root password** (note that there's currently - [a bug where the default password seems to be overriden][password-bug]). + [a bug where the default password seems to be overridden][password-bug]). **Additional notes:** |