diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 03:08:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 03:08:05 +0000 |
| commit | 1926d423f0792f32c642a97e02337aaf685ffd3a (patch) | |
| tree | e3019151d5f911960d4a6fc809b826400573156c | |
| parent | 1caa60060b2f9e3417ab335e2f1dea1064163434 (diff) | |
| download | gitlab-ce-1926d423f0792f32c642a97e02337aaf685ffd3a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/api/pipelines.md | 2 | ||||
| -rw-r--r-- | qa/qa/page/component/issuable/common.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index e1b2c12dd00..4bf44723065 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -14,7 +14,7 @@ GET /projects/:id/pipelines | `scope` | string | no | The scope of pipelines, one of: `running`, `pending`, `finished`, `branches`, `tags` | | `status` | string | no | The status of pipelines, one of: `running`, `pending`, `success`, `failed`, `canceled`, `skipped` | | `ref` | string | no | The ref of pipelines | -| `sha` | string | no | The sha or pipelines | +| `sha` | string | no | The sha of pipelines | | `yaml_errors`| boolean | no | Returns pipelines with invalid configurations | | `name`| string | no | The name of the user who triggered pipelines | | `username`| string | no | The username of the user who triggered pipelines | diff --git a/qa/qa/page/component/issuable/common.rb b/qa/qa/page/component/issuable/common.rb index 9ecc8f73bdb..1155d4da036 100644 --- a/qa/qa/page/component/issuable/common.rb +++ b/qa/qa/page/component/issuable/common.rb @@ -23,11 +23,6 @@ module QA element :save_button element :delete_button end - - base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do - element :save_button - element :delete_button - end end end end |