Commit 7c8fbe8f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq into...

Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
parents 9cb51c6e 680ee045
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%div.file_name File name... %div.file_name File name...
%button.file_upload.btn.small Upload File %button.file_upload.btn.small Upload File
.input= f.file_field :attachment, :class => "input-file" .input= f.file_field :attachment, :class => "input-file"
%span Any file less then 10 MB %span Any file less than 10 MB
= f.submit 'Add Comment', :class => "btn primary", :id => "submit_note" = f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment