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
Boxiang Sun
gitlab-ce
Commits
32e593c6
Commit
32e593c6
authored
Jul 06, 2016
by
Luke "Jared" Bennett
Committed by
Sean McGivern
Jul 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review changes
parent
ea1827c9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
11 deletions
+9
-11
app/assets/javascripts/diff.js.coffee
app/assets/javascripts/diff.js.coffee
+1
-1
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+1
-1
app/assets/javascripts/single_file_diff.js.coffee
app/assets/javascripts/single_file_diff.js.coffee
+4
-5
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+3
-0
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+0
-4
No files found.
app/assets/javascripts/diff.js.coffee
View file @
32e593c6
class
@
Diff
class
@
Diff
UNFOLD_COUNT
=
20
UNFOLD_COUNT
=
20
constructor
:
->
constructor
:
->
$
(
'.files .diff-file'
).
singleDiff
()
$
(
'.files .diff-file'
).
single
File
Diff
()
$
(
document
).
off
(
'click'
,
'.js-unfold'
)
$
(
document
).
off
(
'click'
,
'.js-unfold'
)
$
(
document
).
on
(
'click'
,
'.js-unfold'
,
(
event
)
=>
$
(
document
).
on
(
'click'
,
'.js-unfold'
,
(
event
)
=>
...
...
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
32e593c6
...
@@ -160,7 +160,7 @@ class @MergeRequestTabs
...
@@ -160,7 +160,7 @@ class @MergeRequestTabs
$
(
'#diffs'
).
html
data
.
html
$
(
'#diffs'
).
html
data
.
html
gl
.
utils
.
localTimeAgo
(
$
(
'.js-timeago'
,
'div#diffs'
))
gl
.
utils
.
localTimeAgo
(
$
(
'.js-timeago'
,
'div#diffs'
))
$
(
'#diffs .js-syntax-highlight'
).
syntaxHighlight
()
$
(
'#diffs .js-syntax-highlight'
).
syntaxHighlight
()
$
(
'#diffs .diff-file'
).
singleDiff
()
$
(
'#diffs .diff-file'
).
single
File
Diff
()
@
expandViewContainer
()
if
@
diffViewType
()
is
'parallel'
@
expandViewContainer
()
if
@
diffViewType
()
is
'parallel'
@
diffsLoaded
=
true
@
diffsLoaded
=
true
@
scrollToElement
(
"#diffs"
)
@
scrollToElement
(
"#diffs"
)
...
...
app/assets/javascripts/single_diff.js.coffee
→
app/assets/javascripts/single_
file_
diff.js.coffee
View file @
32e593c6
class
@
SingleDiff
class
@
Single
File
Diff
WRAPPER
=
'<div class="diff-content diff-wrap-lines"></div>'
WRAPPER
=
'<div class="diff-content diff-wrap-lines"></div>'
LOADING_HTML
=
'<i class="fa fa-spinner fa-spin"></i>'
LOADING_HTML
=
'<i class="fa fa-spinner fa-spin"></i>'
...
@@ -24,7 +24,6 @@ class @SingleDiff
...
@@ -24,7 +24,6 @@ class @SingleDiff
$
(
'.file-title > a'
,
@
file
).
on
'click'
,
@
toggleDiff
$
(
'.file-title > a'
,
@
file
).
on
'click'
,
@
toggleDiff
toggleDiff
:
(
e
)
=>
toggleDiff
:
(
e
)
=>
e
.
preventDefault
()
@
isOpen
=
!
@
isOpen
@
isOpen
=
!
@
isOpen
if
not
@
isOpen
and
not
@
hasError
if
not
@
isOpen
and
not
@
hasError
@
content
.
hide
()
@
content
.
hide
()
...
@@ -49,7 +48,7 @@ class @SingleDiff
...
@@ -49,7 +48,7 @@ class @SingleDiff
@
collapsedContent
.
after
(
@
content
)
@
collapsedContent
.
after
(
@
content
)
return
return
$
.
fn
.
singleDiff
=
->
$
.
fn
.
single
File
Diff
=
->
return
@
each
->
return
@
each
->
if
not
$
.
data
this
,
'singleDiff'
if
not
$
.
data
this
,
'single
File
Diff'
$
.
data
this
,
'single
Diff'
,
new
Sing
leDiff
this
$
.
data
this
,
'single
FileDiff'
,
new
SingleFi
leDiff
this
app/assets/stylesheets/framework/blocks.scss
View file @
32e593c6
...
@@ -16,6 +16,9 @@
...
@@ -16,6 +16,9 @@
font-weight
:
normal
;
font-weight
:
normal
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
36px
;
line-height
:
36px
;
&
.diff-collapsed
{
cursor
:
pointer
;
}
}
}
.row-content-block
{
.row-content-block
{
...
...
app/assets/stylesheets/framework/files.scss
View file @
32e593c6
...
@@ -189,7 +189,3 @@ span.idiff {
...
@@ -189,7 +189,3 @@ span.idiff {
border-bottom-right-radius
:
2px
;
border-bottom-right-radius
:
2px
;
}
}
}
}
.nothing-here-block.diff-collapsed
{
cursor
:
pointer
;
}
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