deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sanitize glm helper

Browse source
This commit is contained in:
randx 2012-09-01 23:35:04 +03:00
parent adeeae9f73
commit beb5e1bd6b
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/sections/notes.scss
View file

@ -31,7 +31,7 @@
#new_note { #new_note {
.note-text { .note-text {
height:25px; height:40px;
} }
.attach_holder { .attach_holder {
display:none; display:none;
@ -212,3 +212,8 @@ td .line_note_link {
} }
} }
} }
.note-text {
border: 1px solid #aaa;
box-shadow:none;
}

2
app/helpers/gitlab_markdown_helper.rb
View file

@ -31,7 +31,7 @@ module GitlabMarkdownHelper
extractions[$1] extractions[$1]
end end
text.html_safe sanitize text.html_safe
end end
# Use this in places where you would normally use link_to(gfm(...), ...). # Use this in places where you would normally use link_to(gfm(...), ...).

2
app/views/notes/_per_line_form.html.haml
View file

@ -16,7 +16,7 @@
= f.text_area :note, size: 255, class: 'line-note-text' = f.text_area :note, size: 255, class: 'line-note-text'
.note_actions .note_actions
.buttons .buttons
= f.submit 'Add note', class: "btn primary submit_note submit_inline_note", id: "submit_note" = f.submit 'Add note', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
= link_to "Cancel", "#", class: "btn hide-button" = link_to "Cancel", "#", class: "btn hide-button"
.options .options
%h6.left Notify via email: %h6.left Notify via email: