diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-26 13:12:18 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-26 13:12:18 +0100 |
| commit | 10dccdc4e167901a3d86e04fc0748c539b545c6e (patch) | |
| tree | 1f3168b68407c292c2ab4af4d5ba9f5a5fb1afaf /app | |
| parent | 6becf288190b6883f71ae4b980db3239cd63f831 (diff) | |
| parent | 0defc4f7ccae38e69f0ad185bc912eb4f5448661 (diff) | |
| download | gitlab-ce-10dccdc4e167901a3d86e04fc0748c539b545c6e.tar.gz | |
Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warning
[ci skip]
Diffstat (limited to 'app')
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index 0750d21c15d..3fe0bfdb751 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -48,7 +48,7 @@ class="btn btn-save pull-left" :class="{ disabled: formState.updateLoading || !isSubmitEnabled }" type="submit" - :disabled="formState.updateLoading || !isSubmitEnabled" + :disabled="updateLoading || !isSubmitEnabled" @click.prevent="updateIssuable"> Save changes <i diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index 35b1ea6ff2b..733cc7eab6c 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -43,7 +43,8 @@ aria-label="Description" v-model="formState.description" ref="textarea" - slot="textarea"> + slot="textarea" + placeholder="Write a comment or drag your files here..."> </textarea> </markdown-field> </div> diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index 68bbd263f02..fe9f4993d33 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -62,7 +62,7 @@ /* GLForm class handles all the toolbar buttons */ - return new gl.GLForm($(this.$refs['gl-form'])); + return new gl.GLForm($(this.$refs['gl-form']), true); }, }; </script> diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 62b1bfa997e..c380a10c82d 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -210,7 +210,7 @@ module IssuablesHelper markdownPreviewUrl: preview_markdown_path(@project), markdownDocs: help_page_path('user/markdown'), projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id), - templates: issuable_templates(issuable), + issuableTemplates: issuable_templates(issuable), projectPath: ref_project.path, projectNamespace: ref_project.namespace.full_path, initialTitleHtml: markdown_field(issuable, :title), |