diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-09-20 10:59:54 +0100 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-09-20 10:59:54 +0100 |
| commit | bdae494bcfcd502b201b2f795d4ccebccc52df81 (patch) | |
| tree | 1a28ea3698b2de627258136af53ce1d6261b1e43 | |
| parent | d654c451f45615be39b11d8b532afd7d82135aa0 (diff) | |
| download | gitlab-ce-docs-fix-setup-grammar-marcel-contribution.tar.gz | |
Revert changes on files that are not strictly in /docdocs-fix-setup-grammar-marcel-contribution
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | changelogs/archive.md | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 478565ec2bc..c1d5a638cd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -841,7 +841,7 @@ entry. - Add `Squash and merge` to GitLab Core (CE). !18956 (@blackst0ne) - Adds keyboard shortcut `g k` for Kubernetes on Project pages. !19002 - Adds keyboard shortcut `g e` for Environments on Project pages. !19002 -- Set up graphql with initial project & merge request query. !19008 +- Setup graphql with initial project & merge request query. !19008 - Adds JupyterHub to cluster applications. !19019 - Added ability to search by wiki titles. !19112 - Add Avatar API. !19121 (Imre Farkas) diff --git a/README.md b/README.md index 90fe2ca45b3..335736e53f5 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ All Documentation content that resides under the `doc/` directory of this reposi ## Install a development environment To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit). -If you do not use the GitLab Development Kit you need to install and set up all the dependencies yourself, this is a lot of work and error prone. +If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone. One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file: cp config/unicorn.rb.example.development config/unicorn.rb diff --git a/changelogs/archive.md b/changelogs/archive.md index ba80459c7f8..fe461a6ac5e 100644 --- a/changelogs/archive.md +++ b/changelogs/archive.md @@ -1615,7 +1615,7 @@ - Don't render discussion notes when requesting diff tab through AJAX - Add basic system information like memory and disk usage to the admin panel - Don't garbage collect commits that have related DB records like comments - - Allow to set up event by channel on slack service + - Allow to setup event by channel on slack service - More descriptive message for git hooks and file locks - Aliases of award emoji should be stored as original name. !5060 (dixpac) - Handle custom Git hook result in GitLab UI @@ -3685,7 +3685,7 @@ - Fix final line in EmailsOnPush email diff being rendered as error. - Prevent duplicate Buildkite service creation. - Fix git over ssh errors 'fatal: protocol error: bad line length character' -- Automatically set up GitLab CI project for forks if origin project has GitLab CI enabled +- Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled - Bust group page project list cache when namespace name or path changes. - Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded - Allow user to choose a public email to show on public profile @@ -4683,7 +4683,7 @@ - Replaced gitolite with gitlab-shell - Removed gitolite-related libraries - State machine added -- Set up gitlab as git user +- Setup gitlab as git user - Internal API - Show team tab for empty projects - Import repository feature |