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
9a26120c
Commit
9a26120c
authored
Oct 05, 2015
by
Valery Sizov
Committed by
Robert Speicher
Oct 05, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix anchors to comments in diffs
parent
b4963a75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+7
-0
No files found.
CHANGELOG
View file @
9a26120c
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.0.4
v 8.0.4
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
- Fix referrals for :back and relative URL installs
- Fix referrals for :back and relative URL installs
- Fix anchors to comments in diffs
v 8.0.3
v 8.0.3
- Fix URL shown in Slack notifications
- Fix URL shown in Slack notifications
...
...
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
9a26120c
...
@@ -66,6 +66,11 @@ class @MergeRequestTabs
...
@@ -66,6 +66,11 @@ class @MergeRequestTabs
@
setCurrentAction
(
action
)
@
setCurrentAction
(
action
)
scrollToElement
:
(
container
)
->
if
window
.
location
.
hash
top
=
$
(
container
+
" "
+
window
.
location
.
hash
).
offset
().
top
$
(
'body'
).
scrollTo
(
top
);
# Activate a tab based on the current action
# Activate a tab based on the current action
activateTab
:
(
action
)
->
activateTab
:
(
action
)
->
action
=
'notes'
if
action
==
'show'
action
=
'notes'
if
action
==
'show'
...
@@ -122,6 +127,7 @@ class @MergeRequestTabs
...
@@ -122,6 +127,7 @@ class @MergeRequestTabs
document
.
getElementById
(
'commits'
).
innerHTML
=
data
.
html
document
.
getElementById
(
'commits'
).
innerHTML
=
data
.
html
$
(
'.js-timeago'
).
timeago
()
$
(
'.js-timeago'
).
timeago
()
@
commitsLoaded
=
true
@
commitsLoaded
=
true
@
scrollToElement
(
".commits"
)
loadDiff
:
(
source
)
->
loadDiff
:
(
source
)
->
return
if
@
diffsLoaded
return
if
@
diffsLoaded
...
@@ -131,6 +137,7 @@ class @MergeRequestTabs
...
@@ -131,6 +137,7 @@ class @MergeRequestTabs
success
:
(
data
)
=>
success
:
(
data
)
=>
document
.
getElementById
(
'diffs'
).
innerHTML
=
data
.
html
document
.
getElementById
(
'diffs'
).
innerHTML
=
data
.
html
@
diffsLoaded
=
true
@
diffsLoaded
=
true
@
scrollToElement
(
".diffs"
)
toggleLoading
:
->
toggleLoading
:
->
$
(
'.mr-loading-status .loading'
).
toggle
()
$
(
'.mr-loading-status .loading'
).
toggle
()
...
...
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