diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-06-17 19:52:55 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-06-17 19:52:55 +0800 |
| commit | 5174d6c1468c7c22c3ad98e6d3f7f5175d005635 (patch) | |
| tree | c8e1a04d99dcd3b1a79b18497e3b33a6438ce1b3 /doc/ci/runners | |
| parent | 8a0aeab846f5c97ba56d34644834e38f2378c7ce (diff) | |
| parent | faee4763f7a166772bb40945f82da4b25a95e7d5 (diff) | |
| download | gitlab-ce-5174d6c1468c7c22c3ad98e6d3f7f5175d005635.tar.gz | |
Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master: (337 commits)
Update CHANGELOG for !4659
Center the header logo for all Devise emails
Add previews for all customized Devise emails
Customize the Devise `unlock_instructions` email
Customize the Devise `reset_password_instructions` email
Customize the Devise `password_change` emails
Use gitlab-git 10.2.0
Use Git cached counters on project show page
Fix indentation scss-lint errors
Added title attribute to enties in tree view Closes #18353
Banzai::Filter::ExternalLinkFilter use XPath
Reduce queries in IssueReferenceFilter
Use gitlab_git 10.1.4
Fixed ordering in Project.find_with_namespace
Fix images in emails
Banzai::Filter::UploadLinkFilter use XPath
Turn Group#owners into a has_many association
Make project_id nullable
CHANGELOG [ci skip]
CHANGELOG [ci skip]
...
Diffstat (limited to 'doc/ci/runners')
| -rw-r--r-- | doc/ci/runners/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index 36556f8e670..ddebd987650 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -63,7 +63,7 @@ instance. Now simply register the runner as any runner: ``` -sudo gitlab-runner register +sudo gitlab-ci-multi-runner register ``` Shared runners are enabled by default as of GitLab 8.2, but can be disabled with the @@ -93,7 +93,7 @@ setup a specific runner for this project. To register the runner, run the command below and follow instructions: ``` -sudo gitlab-runner register +sudo gitlab-ci-multi-runner register ``` ### Lock a specific runner from being enabled for other projects |