diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-26 12:28:43 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-26 14:24:44 +0300 |
| commit | 74b031e58221a4f402d318814b614b7395a569a9 (patch) | |
| tree | 0a0a23f3d07bdb0bb57b6aaf1f893646f8cd2e6d /app | |
| parent | 1180a33571d246d9f2372fef3642ffdd6f5da16b (diff) | |
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')
| -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 30a1be5cb50..4835fc39ea7 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> |