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
9860ab0f
Commit
9860ab0f
authored
Jul 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove sticky-diff functionality
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
919e702c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+0
-5
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+0
-3
No files found.
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
9860ab0f
...
@@ -69,7 +69,6 @@ class @MergeRequestTabs
...
@@ -69,7 +69,6 @@ class @MergeRequestTabs
@
loadCommits
(
$target
.
attr
(
'href'
))
@
loadCommits
(
$target
.
attr
(
'href'
))
else
if
action
==
'diffs'
else
if
action
==
'diffs'
@
loadDiff
(
$target
.
attr
(
'href'
))
@
loadDiff
(
$target
.
attr
(
'href'
))
@
stickyDiffHeaders
()
@
setCurrentAction
(
action
)
@
setCurrentAction
(
action
)
...
@@ -137,15 +136,11 @@ class @MergeRequestTabs
...
@@ -137,15 +136,11 @@ class @MergeRequestTabs
url
:
"
#{
source
}
.json"
url
:
"
#{
source
}
.json"
success
:
(
data
)
=>
success
:
(
data
)
=>
document
.
getElementById
(
'diffs'
).
innerHTML
=
data
.
html
document
.
getElementById
(
'diffs'
).
innerHTML
=
data
.
html
@
stickyDiffHeaders
()
@
diffsLoaded
=
true
@
diffsLoaded
=
true
toggleLoading
:
->
toggleLoading
:
->
$
(
'.mr-loading-status .loading'
).
toggle
()
$
(
'.mr-loading-status .loading'
).
toggle
()
stickyDiffHeaders
:
->
$
(
'.diff-header'
).
trigger
(
'sticky_kit:recalc'
)
_get
:
(
options
)
->
_get
:
(
options
)
->
defaults
=
{
defaults
=
{
beforeSend
:
@
toggleLoading
beforeSend
:
@
toggleLoading
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
9860ab0f
...
@@ -20,6 +20,3 @@
...
@@ -20,6 +20,3 @@
Failed to collect changes
Failed to collect changes
%p
%p
Maybe diff is really big and operation failed with timeout. Try to get diff locally
Maybe diff is really big and operation failed with timeout. Try to get diff locally
:coffeescript
$('.files .diff-header').stick_in_parent(offset_top: $('.navbar').height())
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