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
5e952962
Commit
5e952962
authored
Feb 10, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '27994-fix-mr-widget-jump' into 'master'
fixes MR widget jump Closes #27994 See merge request !9146
parents
a2aa5b7e
bda6d700
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/javascripts/merge_request.js
app/assets/javascripts/merge_request.js
+4
-4
app/views/shared/_commit_message_container.html.haml
app/views/shared/_commit_message_container.html.haml
+2
-2
changelogs/unreleased/27994-fix-mr-widget-jump.yml
changelogs/unreleased/27994-fix-mr-widget-jump.yml
+4
-0
No files found.
app/assets/javascripts/merge_request.js
View file @
5e952962
...
@@ -115,8 +115,8 @@ require('./merge_request_tabs');
...
@@ -115,8 +115,8 @@ require('./merge_request_tabs');
e
.
preventDefault
();
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'
messageWithDescription
'
));
textarea
.
val
(
textarea
.
data
(
'
messageWithDescription
'
));
$
(
'
p
.js-with-description-hint
'
).
hide
();
$
(
'
.js-with-description-hint
'
).
hide
();
$
(
'
p
.js-without-description-hint
'
).
show
();
$
(
'
.js-without-description-hint
'
).
show
();
});
});
$
(
document
).
on
(
'
click
'
,
'
a.js-without-description-link
'
,
function
(
e
)
{
$
(
document
).
on
(
'
click
'
,
'
a.js-without-description-link
'
,
function
(
e
)
{
...
@@ -124,8 +124,8 @@ require('./merge_request_tabs');
...
@@ -124,8 +124,8 @@ require('./merge_request_tabs');
e
.
preventDefault
();
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'
messageWithoutDescription
'
));
textarea
.
val
(
textarea
.
data
(
'
messageWithoutDescription
'
));
$
(
'
p
.js-with-description-hint
'
).
show
();
$
(
'
.js-with-description-hint
'
).
show
();
$
(
'
p
.js-without-description-hint
'
).
hide
();
$
(
'
.js-without-description-hint
'
).
hide
();
});
});
};
};
...
...
app/views/shared/_commit_message_container.html.haml
View file @
5e952962
...
@@ -17,9 +17,9 @@
...
@@ -17,9 +17,9 @@
Try to keep the first line under 52 characters
Try to keep the first line under 52 characters
and the others under 72.
and the others under 72.
-
if
descriptions
.
present?
-
if
descriptions
.
present?
%p
.hint.js-with-description-hint
.hint.js-with-description-hint
=
link_to
"#"
,
class:
"js-with-description-link"
do
=
link_to
"#"
,
class:
"js-with-description-link"
do
Include description in commit message
Include description in commit message
%p
.hint.js-without-description-hint.hide
.hint.js-without-description-hint.hide
=
link_to
"#"
,
class:
"js-without-description-link"
do
=
link_to
"#"
,
class:
"js-without-description-link"
do
Don't include description in commit message
Don't include description in commit message
changelogs/unreleased/27994-fix-mr-widget-jump.yml
0 → 100644
View file @
5e952962
---
title
:
Fix MR widget jump
merge_request
:
9146
author
:
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