diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-26 09:28:43 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-26 09:28:43 +0000 |
| commit | 27b98beac94fdc70ba30bfd126b6d6cc2ea33994 (patch) | |
| tree | a875b16c99dcf2df2bc83294a12fd5737e29f394 /app/assets/javascripts | |
| parent | 36cd2baaa33251047c91f47da247cd4a10aa3d66 (diff) | |
| parent | 6d4e8154b0aee8424c6c4739822fb47e72881a8d (diff) | |
| download | gitlab-ce-27b98beac94fdc70ba30bfd126b6d6cc2ea33994.tar.gz | |
Merge branch 'issue-inline-edit-quick-submit' into 'master'
Fixes ctrl+enter not submit issue edit form
Closes #33758
See merge request !12422
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/fields/description.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/issue_show/components/fields/title.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index 54650d2f184..27b1b814f9a 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -47,7 +47,8 @@ ref="textarea" slot="textarea" placeholder="Write a comment or drag your files here..." - @keydown.meta.enter="updateIssuable"> + @keydown.meta.enter="updateIssuable" + @keydown.ctrl.enter="updateIssuable"> </textarea> </markdown-field> </div> diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue index 6556bf117e2..83af8e1e245 100644 --- a/app/assets/javascripts/issue_show/components/fields/title.vue +++ b/app/assets/javascripts/issue_show/components/fields/title.vue @@ -26,6 +26,7 @@ placeholder="Issue title" aria-label="Issue title" v-model="formState.title" - @keydown.meta.enter="updateIssuable" /> + @keydown.meta.enter="updateIssuable" + @keydown.ctrl.enter="updateIssuable" /> </fieldset> </template> |