Commit d1980ef9 authored by Gabriel Gizotti's avatar Gabriel Gizotti

only render MR description toggle javascript if description is available

parent 1a72dc24
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%p.hint %p.hint
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 local_assigns[:description] - if local_assigns[:description]
%p.hint.use-description-hint %p.hint.use-description-hint
= link_to "#", class: "use-description-link" do = link_to "#", class: "use-description-link" do
Use Merge Request description as merge commit message Use Merge Request description as merge commit message
...@@ -22,29 +22,28 @@ ...@@ -22,29 +22,28 @@
= link_to "#", class: "use-default-message-link" do = link_to "#", class: "use-default-message-link" do
Use default Gitlab merge commit message Use default Gitlab merge commit message
:javascript
$('.use-description-link').on('click', function(e) {
e.preventDefault();
:javascript var message = "Merge branch '#{j @merge_request.source_branch}' into '#{j @merge_request.target_branch}'\n\n"
$('.use-description-link').on('click', function(e) { message = message + "#{j @merge_request.title}\n\n"
e.preventDefault(); message = message + "#{j local_assigns[:description]}\n\n";
message = message + "See merge request #{j @merge_request.to_reference}"
var message = "Merge branch '#{j @merge_request.source_branch}' into '#{j @merge_request.target_branch}'\n\n"
message = message + "#{j @merge_request.title}\n\n"
message = message + "#{j local_assigns[:description]}\n\n";
message = message + "See merge request #{j @merge_request.to_reference}"
$('.use-description-hint').hide();
$('.use-default-message-hint').show();
$('.js-commit-message').val(message)
});
$('.use-description-hint').hide(); $('.use-default-message-link').on('click', function(e) {
$('.use-default-message-hint').show(); e.preventDefault();
$('.js-commit-message').val(message)
});
$('.use-default-message-link').on('click', function(e) { var defaultMessage = "#{j (params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder])}";
e.preventDefault();
var defaultMessage = "#{j (params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder])}"; $('.use-description-hint').show();
$('.use-default-message-hint').hide();
$('.use-description-hint').show(); $('.js-commit-message').val(defaultMessage);
$('.use-default-message-hint').hide(); });
$('.js-commit-message').val(defaultMessage);
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment