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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9a60bd54
Commit
9a60bd54
authored
Feb 19, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change method name for consistency
parent
27a0310f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+2
-2
No files found.
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
9a60bd54
...
@@ -146,7 +146,7 @@ class @MergeRequestTabs
...
@@ -146,7 +146,7 @@ class @MergeRequestTabs
success
:
(
data
)
=>
success
:
(
data
)
=>
document
.
querySelector
(
"div#diffs"
).
innerHTML
=
data
.
html
document
.
querySelector
(
"div#diffs"
).
innerHTML
=
data
.
html
$
(
'div#diffs .js-syntax-highlight'
).
syntaxHighlight
()
$
(
'div#diffs .js-syntax-highlight'
).
syntaxHighlight
()
@
expandViewContainer
()
if
@
diffView
Mod
e
()
is
'parallel'
@
expandViewContainer
()
if
@
diffView
Typ
e
()
is
'parallel'
@
diffsLoaded
=
true
@
diffsLoaded
=
true
@
scrollToElement
(
"#diffs"
)
@
scrollToElement
(
"#diffs"
)
...
@@ -180,7 +180,7 @@ class @MergeRequestTabs
...
@@ -180,7 +180,7 @@ class @MergeRequestTabs
$
.
ajax
(
options
)
$
.
ajax
(
options
)
# Returns diff view type
# Returns diff view type
diffView
Mod
e
:
->
diffView
Typ
e
:
->
$
(
'.diffs a[id$="-diff-btn"].active'
).
data
(
'view-type'
)
$
(
'.diffs a[id$="-diff-btn"].active'
).
data
(
'view-type'
)
expandViewContainer
:
->
expandViewContainer
:
->
...
...
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