BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8d207c6d
Unverified
Commit
8d207c6d
authored
Feb 10, 2017
by
Nur Rony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes MR widget jump
parent
199b17e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
merge_request.js
app/assets/javascripts/merge_request.js
+4
-4
_commit_message_container.html.haml
app/views/shared/_commit_message_container.html.haml
+2
-2
No files found.
app/assets/javascripts/merge_request.js
View file @
8d207c6d
...
...
@@ -115,8 +115,8 @@ require('./merge_request_tabs');
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'messageWithDescription'
));
$
(
'
p
.js-with-description-hint'
).
hide
();
$
(
'
p
.js-without-description-hint'
).
show
();
$
(
'.js-with-description-hint'
).
hide
();
$
(
'.js-without-description-hint'
).
show
();
});
$
(
document
).
on
(
'click'
,
'a.js-without-description-link'
,
function
(
e
)
{
...
...
@@ -124,8 +124,8 @@ require('./merge_request_tabs');
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'messageWithoutDescription'
));
$
(
'
p
.js-with-description-hint'
).
show
();
$
(
'
p
.js-without-description-hint'
).
hide
();
$
(
'.js-with-description-hint'
).
show
();
$
(
'.js-without-description-hint'
).
hide
();
});
};
...
...
app/views/shared/_commit_message_container.html.haml
View file @
8d207c6d
...
...
@@ -17,9 +17,9 @@
Try to keep the first line under 52 characters
and the others under 72.
-
if
descriptions
.
present?
%p
.hint.js-with-description-hint
.hint.js-with-description-hint
=
link_to
"#"
,
class:
"js-with-description-link"
do
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
Don't include description in commit message
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