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
3c2d98f4
Commit
3c2d98f4
authored
Jul 14, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: Address MR comments.
parent
b26637c5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+1
-1
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+4
-4
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+1
-1
No files found.
app/assets/javascripts/issue.js
View file @
3c2d98f4
...
@@ -42,7 +42,7 @@ class Issue {
...
@@ -42,7 +42,7 @@ class Issue {
initIssueBtnEventListeners
()
{
initIssueBtnEventListeners
()
{
const
issueFailMessage
=
'
Unable to update this issue at this time.
'
;
const
issueFailMessage
=
'
Unable to update this issue at this time.
'
;
return
$
(
document
).
on
(
'
click
'
,
'
.
issuable-actions a.btn-close, .
issuable-actions a.btn-reopen
'
,
(
e
)
=>
{
return
$
(
document
).
on
(
'
click
'
,
'
.
js-issuable-actions a.btn-close, .js-
issuable-actions a.btn-reopen
'
,
(
e
)
=>
{
var
$button
,
shouldSubmit
,
url
;
var
$button
,
shouldSubmit
,
url
;
e
.
preventDefault
();
e
.
preventDefault
();
e
.
stopImmediatePropagation
();
e
.
stopImmediatePropagation
();
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
3c2d98f4
...
@@ -161,12 +161,12 @@
...
@@ -161,12 +161,12 @@
};
};
gl
.
utils
.
scrollToElement
=
function
(
$el
)
{
gl
.
utils
.
scrollToElement
=
function
(
$el
)
{
var
top
=
$el
.
offset
().
top
;
const
top
=
$el
.
offset
().
top
;
var
mrTabsHeight
=
$
(
'
.merge-request-tabs
'
).
height
()
||
0
;
const
mrTabsHeight
=
$
(
'
.merge-request-tabs
'
).
height
()
||
0
;
var
headerHeight
=
$
(
'
.navbar-gitlab
'
).
height
()
||
0
;
const
headerHeight
=
$
(
'
.navbar-gitlab
'
).
height
()
||
0
;
return
$
(
'
body, html
'
).
animate
({
return
$
(
'
body, html
'
).
animate
({
scrollTop
:
top
-
mrTabsHeight
-
headerHeight
scrollTop
:
top
-
mrTabsHeight
-
headerHeight
,
},
200
);
},
200
);
};
};
...
...
app/views/projects/issues/show.html.haml
View file @
3c2d98f4
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
=
confidential_icon
(
@issue
)
=
confidential_icon
(
@issue
)
=
issuable_meta
(
@issue
,
@project
,
"Issue"
)
=
issuable_meta
(
@issue
,
@project
,
"Issue"
)
.issuable-actions
.issuable-actions
.js-issuable-actions
.clearfix.issue-btn-group.dropdown
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-default.pull-left.hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-default.pull-left.hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Options
Options
...
...
app/views/projects/merge_requests/_mr_title.html.haml
View file @
3c2d98f4
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.issuable-meta
.issuable-meta
=
issuable_meta
(
@merge_request
,
@project
,
"Merge request"
)
=
issuable_meta
(
@merge_request
,
@project
,
"Merge request"
)
.issuable-actions
.issuable-actions
.js-issuable-actions
.clearfix.issue-btn-group.dropdown
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-default.pull-left.hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-default.pull-left.hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Options
Options
...
...
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