diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 18:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 18:08:42 +0300 |
| commit | 9086e66ee72527839053ec6db19ed321a3b3a61b (patch) | |
| tree | f2904493d8539228823f15cf4126eb8c4ffa79e3 /app/assets/javascripts/releases | |
| parent | b17c74a7e2cf516ed189e525291cb096411b7ac5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
| -rw-r--r-- | app/assets/javascripts/releases/components/app_edit_new.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/releases/util.js | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue index 1a07e0ed762..c3582cf04dc 100644 --- a/app/assets/javascripts/releases/components/app_edit_new.vue +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -6,7 +6,7 @@ import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { BACK_URL_PARAM } from '~/releases/constants'; import { getParameterByName } from '~/lib/utils/common_utils'; import AssetLinksForm from './asset_links_form.vue'; -import MilestoneCombobox from '~/milestones/project_milestone_combobox.vue'; +import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; import TagField from './tag_field.vue'; export default { diff --git a/app/assets/javascripts/releases/util.js b/app/assets/javascripts/releases/util.js index 445c429fd96..ac88bd7e291 100644 --- a/app/assets/javascripts/releases/util.js +++ b/app/assets/javascripts/releases/util.js @@ -15,15 +15,13 @@ import { export const releaseToApiJson = (release, createFrom = null) => { const name = release.name?.trim().length > 0 ? release.name.trim() : null; - const milestones = release.milestones ? release.milestones.map(milestone => milestone.title) : []; - return convertObjectPropsToSnakeCase( { name, tagName: release.tagName, ref: createFrom, description: release.description, - milestones, + milestones: release.milestones, assets: release.assets, }, { deep: true }, |