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
Tatuya Kamada
gitlab-ce
Commits
3d7b35a3
Commit
3d7b35a3
authored
Jan 20, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
per line comment fix
parent
8c46123f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
11 deletions
+34
-11
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+17
-2
app/models/note.rb
app/models/note.rb
+4
-0
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+4
-0
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+9
-9
No files found.
app/assets/stylesheets/commits.css.scss
View file @
3d7b35a3
...
@@ -78,7 +78,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
...
@@ -78,7 +78,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
padding
:
0px
;
padding
:
0px
;
border
:none
;
border
:none
;
background
:
#F7F7F7
;
background
:
#F7F7F7
;
color
:
#
333
;
color
:
#
aaa
;
padding
:
0px
5px
;
padding
:
0px
5px
;
border-right
:
1px
solid
#ccc
;
border-right
:
1px
solid
#ccc
;
text-align
:right
;
text-align
:right
;
...
@@ -89,7 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
...
@@ -89,7 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
float
:left
;
float
:left
;
width
:
35px
;
width
:
35px
;
font-weight
:normal
;
font-weight
:normal
;
color
:
#
888
;
color
:
#
aaa
;
&
:hover
{
&
:hover
{
text-decoration
:underline
;
text-decoration
:underline
;
}
}
...
@@ -146,3 +146,18 @@ ul.bordered-list li:last-child { border:none }
...
@@ -146,3 +146,18 @@ ul.bordered-list li:last-child { border:none }
}
}
}
}
}
}
.per_line_form
{
background
:
#79C3E0
;
form
{
width
:
743px
;
border
:
1px
solid
#CCC
;
padding
:
20px
;
background
:
white
;
}
.hide-button
{
color
:
#c33
;
}
}
app/models/note.rb
View file @
3d7b35a3
...
@@ -52,6 +52,10 @@ class Note < ActiveRecord::Base
...
@@ -52,6 +52,10 @@ class Note < ActiveRecord::Base
else
else
noteable
noteable
end
end
# Temp fix to prevent app crash
# if note commit id doesnt exist
rescue
nil
end
end
def
line_file_id
def
line_file_id
...
...
app/views/commits/_text_file.html.haml
View file @
3d7b35a3
...
@@ -10,6 +10,10 @@
...
@@ -10,6 +10,10 @@
-
if
line
.
match
(
/^@@ -/
)
-
if
line
.
match
(
/^@@ -/
)
-
line_old
=
line
.
match
(
/\-[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
-
line_old
=
line
.
match
(
/\-[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
-
line_new
=
line
.
match
(
/\+[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
-
line_new
=
line
.
match
(
/\+[0-9]*/
)[
0
].
to_i
.
abs
rescue
0
%tr
.line_holder
%td
.old_line
=
"..."
%td
.new_line
=
"..."
%td
.line_content
-
next
-
next
-
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
-
full_line
=
html_escape
(
line
.
gsub
(
/\n/
,
''
))
...
...
app/views/notes/_per_line_form.html.haml
View file @
3d7b35a3
...
@@ -18,17 +18,17 @@
...
@@ -18,17 +18,17 @@
%br
%br
%br
%br
=
f
.
text_area
:note
,
:size
=>
255
=
f
.
text_area
:note
,
:size
=>
255
%p
.notify_controls
%span
Notify:
=
check_box_tag
:notify
,
1
,
@note
.
noteable_type
!=
"Commit"
=
label_tag
:notify
,
"Project team"
-
if
@note
.
noteable_type
==
"Commit"
=
check_box_tag
:notify_author
,
1
,
@note
.
noteable_type
==
"Commit"
=
label_tag
:notify_author
,
"Commit author"
.clear
.clear
%br
%br
=
f
.
submit
'Add note'
,
:class
=>
"grey-button"
,
:id
=>
"submit_note"
=
f
.
submit
'Add note'
,
:class
=>
"grey-button"
,
:id
=>
"submit_note"
.right
=
link_to
"remove"
,
"#"
,
:class
=>
"hide-button"
:javascript
$
(
function
(){
$
(
"
.per_line_form .hide-button
"
).
bind
(
"
click
"
,
function
(){
$
(
'
.per_line_form
'
).
hide
();
return
false
;
});
});
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