Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
beb5e1bd
Commit
beb5e1bd
authored
Sep 01, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sanitize glm helper
parent
adeeae9f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+6
-1
app/helpers/gitlab_markdown_helper.rb
app/helpers/gitlab_markdown_helper.rb
+1
-1
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/notes.scss
View file @
beb5e1bd
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
#new_note
{
#new_note
{
.note-text
{
.note-text
{
height
:
25
px
;
height
:
40
px
;
}
}
.attach_holder
{
.attach_holder
{
display
:none
;
display
:none
;
...
@@ -212,3 +212,8 @@ td .line_note_link {
...
@@ -212,3 +212,8 @@ td .line_note_link {
}
}
}
}
}
}
.note-text
{
border
:
1px
solid
#aaa
;
box-shadow
:none
;
}
app/helpers/gitlab_markdown_helper.rb
View file @
beb5e1bd
...
@@ -31,7 +31,7 @@ module GitlabMarkdownHelper
...
@@ -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(...), ...).
...
...
app/views/notes/_per_line_form.html.haml
View file @
beb5e1bd
...
@@ -16,7 +16,7 @@
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment