summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/importer_status.js
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-05 14:09:01 -0700
committerStan Hu <stanhu@gmail.com>2018-07-05 14:09:01 -0700
commita78e36abab6d30d2fc7571ab095a2c08bd52dd24 (patch)
treea38419b13447d2d5af0eef27350bdfd4745ba46d /app/assets/javascripts/importer_status.js
parentc7198166e8790a1335de0a08bd38080873806710 (diff)
downloadgitlab-ce-a78e36abab6d30d2fc7571ab095a2c08bd52dd24.tar.gz
Improve error handling of Bitbucket login errors
Diffstat (limited to 'app/assets/javascripts/importer_status.js')
-rw-r--r--app/assets/javascripts/importer_status.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/importer_status.js b/app/assets/javascripts/importer_status.js
index fb8851638bf..69ee06db1f3 100644
--- a/app/assets/javascripts/importer_status.js
+++ b/app/assets/javascripts/importer_status.js
@@ -36,6 +36,8 @@ class ImporterStatus {
const $targetField = $tr.find('.import-target');
const $namespaceInput = $targetField.find('.js-select-namespace option:selected');
const id = $tr.attr('id').replace('repo_', '');
+ const repoData = $tr.data();
+
let targetNamespace;
let newName;
if ($namespaceInput.length > 0) {
@@ -47,12 +49,18 @@ class ImporterStatus {
this.id = id;
- return axios.post(this.importUrl, {
+ let attributes = {
repo_id: id,
target_namespace: targetNamespace,
new_name: newName,
- ci_cd_only: this.ciCdOnly,
- })
+ ci_cd_only: this.ciCdOnly
+ };
+
+ if (repoData) {
+ attributes = Object.assign(repoData, attributes);
+ }
+
+ return axios.post(this.importUrl, attributes)
.then(({ data }) => {
const job = $(`tr#repo_${id}`);
job.attr('id', `project_${data.id}`);