diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-05-31 16:37:49 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 13:27:20 +0300 |
commit | 47420a2d6222b36bb58599b181075e2a356665ea (patch) | |
tree | 80953594413adf3f61aa22a8d303b96d1cd057de /doc | |
parent | 2226b5a1555b42461045410ef978a7216afab48a (diff) |
Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'master'
Check only a merge ability for protected actions
Closes #32618
See merge request !11648
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/yaml/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index e542b1119ea..0a0be717fa8 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -587,7 +587,7 @@ Optional manual actions have `allow_failure: true` set by default. **Manual actions are considered to be write actions, so permissions for protected branches are used when user wants to trigger an action. In other words, in order to trigger a manual action assigned to a branch that the -pipeline is running for, user needs to have ability to push to this branch.** +pipeline is running for, user needs to have ability to merge to this branch.** ### environment |