From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Aug 2020 18:42:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee --- .../javascripts/releases/components/app_edit.vue | 220 --------------------- .../releases/components/app_edit_new.vue | 194 ++++++++++++++++++ .../javascripts/releases/components/app_new.vue | 9 - .../releases/components/asset_links_form.vue | 14 +- .../releases/components/form_field_container.vue | 12 ++ .../releases/components/release_block_assets.vue | 4 +- .../releases/components/release_block_author.vue | 2 +- .../components/release_block_milestone_info.vue | 2 +- .../javascripts/releases/components/tag_field.vue | 20 ++ .../releases/components/tag_field_existing.vue | 51 +++++ .../releases/components/tag_field_new.vue | 100 ++++++++++ 11 files changed, 393 insertions(+), 235 deletions(-) delete mode 100644 app/assets/javascripts/releases/components/app_edit.vue create mode 100644 app/assets/javascripts/releases/components/app_edit_new.vue delete mode 100644 app/assets/javascripts/releases/components/app_new.vue create mode 100644 app/assets/javascripts/releases/components/form_field_container.vue create mode 100644 app/assets/javascripts/releases/components/tag_field.vue create mode 100644 app/assets/javascripts/releases/components/tag_field_existing.vue create mode 100644 app/assets/javascripts/releases/components/tag_field_new.vue (limited to 'app/assets/javascripts/releases/components') diff --git a/app/assets/javascripts/releases/components/app_edit.vue b/app/assets/javascripts/releases/components/app_edit.vue deleted file mode 100644 index 01dd0638023..00000000000 --- a/app/assets/javascripts/releases/components/app_edit.vue +++ /dev/null @@ -1,220 +0,0 @@ - - diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue new file mode 100644 index 00000000000..7b7c80a6269 --- /dev/null +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -0,0 +1,194 @@ + + diff --git a/app/assets/javascripts/releases/components/app_new.vue b/app/assets/javascripts/releases/components/app_new.vue deleted file mode 100644 index 563f76b3281..00000000000 --- a/app/assets/javascripts/releases/components/app_new.vue +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue index d0d1485d8e7..07fab840067 100644 --- a/app/assets/javascripts/releases/components/asset_links_form.vue +++ b/app/assets/javascripts/releases/components/asset_links_form.vue @@ -49,6 +49,12 @@ export default { this.removeAssetLink(linkId); this.ensureAtLeastOneLink(); }, + updateUrl(link, newUrl) { + this.updateAssetLinkUrl({ linkIdToUpdate: link.id, newUrl }); + }, + updateName(link, newName) { + this.updateAssetLinkName({ linkIdToUpdate: link.id, newName }); + }, hasDuplicateUrl(link) { return Boolean(this.getLinkErrors(link).isDuplicate); }, @@ -138,7 +144,9 @@ export default { type="text" class="form-control" :state="isUrlValid(link)" - @change="updateAssetLinkUrl({ linkIdToUpdate: link.id, newUrl: $event })" + @change="updateUrl(link, $event)" + @keydown.ctrl.enter="updateUrl(link, $event.target.value)" + @keydown.meta.enter="updateUrl(link, $event.target.value)" />