diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-06-02 14:56:50 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-06-05 12:07:13 +0200 |
commit | 4ae67fcaefe7ca66e06933a18368e592d8ebc260 (patch) | |
tree | 7d3b171dae75ab143cc2111caa6959cd832e6c7d /app/views/projects/notes | |
parent | 1f78aeba40f76f6a2f6b44327367282838301a3f (diff) | |
download | gitlab-ce-4ae67fcaefe7ca66e06933a18368e592d8ebc260.tar.gz |
Show warning when a comment will add 10 or more people to the discussion.
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r-- | app/views/projects/notes/_form.html.haml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 2ada6cb6700..f28b3e9b508 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -5,7 +5,7 @@ = f.hidden_field :noteable_id = f.hidden_field :noteable_type - = render layout: 'projects/md_preview', locals: { preview_class: "note-text" } do + = render layout: 'projects/md_preview', locals: { preview_class: "note-text", referenced_users: true } do = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text' @@ -15,10 +15,7 @@ .error-alert .note-form-actions - .buttons + .buttons.clearfix = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button" = yield(:note_actions) %a.btn.grouped.js-close-discussion-note-form Cancel - -:javascript - window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}"; |