diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
| commit | 3398e0a3d7a1bed8efb7e700dee92f95173d8334 (patch) | |
| tree | 92817b5e9127c613b61a137e6add5d28cb42c4f0 /app/views/projects/wikis | |
| parent | 31fcac9ff9e1c3a0b08617bcc9d5e549c11634b6 (diff) | |
| download | gitlab-ce-3398e0a3d7a1bed8efb7e700dee92f95173d8334.tar.gz | |
Revert "Implements and refactors clipboard feature for markdown."
This reverts commit 2273234653924b731f9ef01432e392481ee1d4e2.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/issues/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/milestones/_form.html.haml
app/views/projects/notes/_form.html.haml
app/views/projects/wikis/_form.html.haml
Diffstat (limited to 'app/views/projects/wikis')
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index a0a56b84a10..0a24e36ae84 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -25,7 +25,7 @@ = f.text_area :content, class: 'form-control js-gfm-input markdown-area', rows: 18 .col-sm-12.hint .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert .form-group @@ -39,7 +39,7 @@ - else = f.submit 'Create page', class: "btn-create btn" = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel" - + :javascript window.project_image_path_upload = "#{upload_image_project_path @project}"; |