summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/blob/blob_file_dropzone.js
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2016-12-22 07:21:40 +0100
committerJacopo <beschi.jacopo@gmail.com>2017-03-13 16:36:11 +0100
commite0fe2834ebe6d9678444c8a10b79ca093f944232 (patch)
treea2d7c482f7271d8af7ba47e76c9d48a1d3e357f4 /app/assets/javascripts/blob/blob_file_dropzone.js
parent9ed3db915026c6e0cd266a1c276386e3e96d2151 (diff)
downloadgitlab-ce-e0fe2834ebe6d9678444c8a10b79ca093f944232.tar.gz
New file from interface on existing branch
Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
Diffstat (limited to 'app/assets/javascripts/blob/blob_file_dropzone.js')
-rw-r--r--app/assets/javascripts/blob/blob_file_dropzone.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js
index 5f14ff40eee..8f6bf162d6e 100644
--- a/app/assets/javascripts/blob/blob_file_dropzone.js
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
@@ -36,7 +36,7 @@
this.removeFile(file);
});
return this.on('sending', function(file, xhr, formData) {
- formData.append('target_branch', form.find('.js-target-branch').val());
+ formData.append('target_branch', form.find('input[name="target_branch"]').val());
formData.append('create_merge_request', form.find('.js-create-merge-request').val());
formData.append('commit_message', form.find('.js-commit-message').val());
});