diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:09:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:09:52 +0000 |
| commit | 81c0f29ad962733b0750bdab2d3250e2c796a578 (patch) | |
| tree | 42d31d9c48d156849c87aee7f4c3c494d2ca6260 /app/graphql | |
| parent | 842ac3526cba09feb4b9ccefd0aeeb6edc02035d (diff) | |
| download | gitlab-ce-81c0f29ad962733b0750bdab2d3250e2c796a578.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql')
| -rw-r--r-- | app/graphql/mutations/ci/pipeline/cancel.rb | 2 | ||||
| -rw-r--r-- | app/graphql/mutations/notes/update/note.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/graphql/mutations/ci/pipeline/cancel.rb b/app/graphql/mutations/ci/pipeline/cancel.rb index 3fb34a37cfc..3ec6eee9f54 100644 --- a/app/graphql/mutations/ci/pipeline/cancel.rb +++ b/app/graphql/mutations/ci/pipeline/cancel.rb @@ -13,6 +13,8 @@ module Mutations if pipeline.cancelable? pipeline.cancel_running + pipeline.cancel + { success: true, errors: [] } else { success: false, errors: ['Pipeline is not cancelable'] } diff --git a/app/graphql/mutations/notes/update/note.rb b/app/graphql/mutations/notes/update/note.rb index c7ee0148f94..a483294169f 100644 --- a/app/graphql/mutations/notes/update/note.rb +++ b/app/graphql/mutations/notes/update/note.rb @@ -15,7 +15,8 @@ module Mutations argument :confidential, GraphQL::Types::Boolean, required: false, - description: 'Confidentiality flag of a note. Default is false.' + description: 'Confidentiality flag of a note. Default is false.', + deprecated: { reason: 'No longer allowed to update confidentiality of notes', milestone: '14.10' } private |