diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-25 14:35:19 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-25 14:35:19 +0100 |
| commit | e20654fcc33ad4e7df0e5da1112c33f99d4630b7 (patch) | |
| tree | 394f95da267fba77619749854800941c1d7c8835 | |
| parent | 04178d72b5ead680643f6a727e58066b0b17e259 (diff) | |
| download | gitlab-ce-e20654fcc33ad4e7df0e5da1112c33f99d4630b7.tar.gz | |
fixed GFM references not working
[ci skip]
| -rw-r--r-- | app/assets/javascripts/issue_show/components/fields/description.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 2 |
2 files changed, 3 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 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> |