diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-13 21:09:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-13 21:09:11 +0300 |
commit | feb61d56e7ce9ab2cd994486bbad9887c3c023f5 (patch) | |
tree | 716c5af8f027f560e66123a90f848e7a9c8f80c4 /app/assets/javascripts/releases | |
parent | 37699393e9d68181a04f54ded5ae1b08b6272291 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
3 files changed, 4 insertions, 19 deletions
diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue index e0705489738..8d1bc44cba0 100644 --- a/app/assets/javascripts/releases/components/app_edit_new.vue +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -29,7 +29,6 @@ export default { 'markdownDocsPath', 'markdownPreviewPath', 'releasesPagePath', - 'updateReleaseApiDocsPath', 'release', 'newMilestonePath', 'manageMilestonesPath', diff --git a/app/assets/javascripts/releases/components/tag_field_existing.vue b/app/assets/javascripts/releases/components/tag_field_existing.vue index b84e713df26..046885fe2f6 100644 --- a/app/assets/javascripts/releases/components/tag_field_existing.vue +++ b/app/assets/javascripts/releases/components/tag_field_existing.vue @@ -1,14 +1,14 @@ <script> import { mapState } from 'vuex'; import { uniqueId } from 'lodash'; -import { GlFormGroup, GlFormInput, GlLink, GlSprintf } from '@gitlab/ui'; +import { GlFormGroup, GlFormInput } from '@gitlab/ui'; import FormFieldContainer from './form_field_container.vue'; export default { name: 'TagFieldExisting', - components: { GlFormGroup, GlFormInput, GlSprintf, GlLink, FormFieldContainer }, + components: { GlFormGroup, GlFormInput, FormFieldContainer }, computed: { - ...mapState('detail', ['release', 'updateReleaseApiDocsPath']), + ...mapState('detail', ['release']), inputId() { return uniqueId('tag-name-input-'); }, @@ -32,19 +32,7 @@ export default { </form-field-container> <template #description> <div :id="helpId" data-testid="tag-name-help"> - <gl-sprintf - :message=" - __( - 'Changing a Release tag is only supported via Releases API. %{linkStart}More information%{linkEnd}', - ) - " - > - <template #link="{ content }"> - <gl-link :href="updateReleaseApiDocsPath" target="_blank"> - {{ content }} - </gl-link> - </template> - </gl-sprintf> + {{ __("The tag name can't be changed for an existing release.") }} </div> </template> </gl-form-group> diff --git a/app/assets/javascripts/releases/stores/modules/detail/state.js b/app/assets/javascripts/releases/stores/modules/detail/state.js index e22d06f8daa..315d07ac664 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/state.js +++ b/app/assets/javascripts/releases/stores/modules/detail/state.js @@ -5,7 +5,6 @@ export default ({ projectPath, markdownDocsPath, markdownPreviewPath, - updateReleaseApiDocsPath, releaseAssetsDocsPath, manageMilestonesPath, newMilestonePath, @@ -20,7 +19,6 @@ export default ({ projectPath, markdownDocsPath, markdownPreviewPath, - updateReleaseApiDocsPath, releaseAssetsDocsPath, manageMilestonesPath, newMilestonePath, |