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
42086615
Commit
42086615
authored
Feb 02, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix intermittant errors in merge_commit_message_toggle_spec.rb
parent
4615d099
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/merge_request.js
app/assets/javascripts/merge_request.js
+4
-4
No files found.
app/assets/javascripts/merge_request.js
View file @
42086615
...
@@ -110,9 +110,8 @@
...
@@ -110,9 +110,8 @@
};
};
MergeRequest
.
prototype
.
initCommitMessageListeners
=
function
()
{
MergeRequest
.
prototype
.
initCommitMessageListeners
=
function
()
{
var
textarea
=
$
(
'
textarea.js-commit-message
'
);
$
(
document
).
on
(
'
click
'
,
'
a.js-with-description-link
'
,
function
(
e
)
{
var
textarea
=
$
(
'
textarea.js-commit-message
'
);
$
(
'
a.js-with-description-link
'
).
on
(
'
click
'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'
messageWithDescription
'
));
textarea
.
val
(
textarea
.
data
(
'
messageWithDescription
'
));
...
@@ -120,7 +119,8 @@
...
@@ -120,7 +119,8 @@
$
(
'
p.js-without-description-hint
'
).
show
();
$
(
'
p.js-without-description-hint
'
).
show
();
});
});
$
(
'
a.js-without-description-link
'
).
on
(
'
click
'
,
function
(
e
)
{
$
(
document
).
on
(
'
click
'
,
'
a.js-without-description-link
'
,
function
(
e
)
{
var
textarea
=
$
(
'
textarea.js-commit-message
'
);
e
.
preventDefault
();
e
.
preventDefault
();
textarea
.
val
(
textarea
.
data
(
'
messageWithoutDescription
'
));
textarea
.
val
(
textarea
.
data
(
'
messageWithoutDescription
'
));
...
...
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