diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/releases | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/releases')
4 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/releases/components/tag_field_new.vue b/app/assets/javascripts/releases/components/tag_field_new.vue index 80f59485426..9e05d00a98d 100644 --- a/app/assets/javascripts/releases/components/tag_field_new.vue +++ b/app/assets/javascripts/releases/components/tag_field_new.vue @@ -95,6 +95,8 @@ export default { noRefSelected: __('No tag selected'), dropdownHeader: __('Tag name'), searchPlaceholder: __('Search or create tag'), + label: __('Tag name'), + labelDescription: __('*Required'), }, createFrom: { noRefSelected: __('No source selected'), @@ -108,11 +110,12 @@ export default { <template> <div> <gl-form-group - :label="__('Tag name')" - :label-for="tagNameInputId" data-testid="tag-name-field" :state="!showTagNameValidationError" :invalid-feedback="__('Tag name is required')" + :label="$options.translations.tagName.label" + :label-for="tagNameInputId" + :label-description="$options.translations.tagName.labelDescription" > <form-field-container> <ref-selector diff --git a/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql b/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql index f2d89dbe682..c69481150e0 100644 --- a/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql +++ b/app/assets/javascripts/releases/graphql/queries/all_releases.query.graphql @@ -6,7 +6,7 @@ # When the `releases_index_apollo_client` feature flag is # removed, this query should be removed entirely. -query allReleases( +query allReleasesDeprecated( $fullPath: ID! $first: Int $last: Int diff --git a/app/assets/javascripts/releases/mount_index.js b/app/assets/javascripts/releases/mount_index.js index 59f6ebfc928..86fa72d1496 100644 --- a/app/assets/javascripts/releases/mount_index.js +++ b/app/assets/javascripts/releases/mount_index.js @@ -24,7 +24,6 @@ export default () => { // the purpose of making separate requests. So we explicitly // disable batching on this page. batchMax: 1, - assumeImmutableResults: true, }, ), }); diff --git a/app/assets/javascripts/releases/mount_show.js b/app/assets/javascripts/releases/mount_show.js index 686f9e294b7..7272880197a 100644 --- a/app/assets/javascripts/releases/mount_show.js +++ b/app/assets/javascripts/releases/mount_show.js @@ -6,12 +6,7 @@ import ReleaseShowApp from './components/app_show.vue'; Vue.use(VueApollo); const apolloProvider = new VueApollo({ - defaultClient: createDefaultClient( - {}, - { - assumeImmutableResults: true, - }, - ), + defaultClient: createDefaultClient(), }); export default () => { |