Add latest changes from gitlab-org/gitlab@master

2 files changed, 32 insertions, 15 deletions

diff --git a/app/assets/javascripts/releases/detail/components/app.vue b/app/assets/javascripts/releases/detail/components/app.vue
index 54a441de886..073cfcd7694 100644
--- a/app/assets/javascripts/releases/detail/components/app.vue
+++ b/app/assets/javascripts/releases/detail/components/app.vue
@@ -1,6 +1,7 @@
 <script>
 import { mapState, mapActions } from 'vuex';
 import { GlButton, GlFormInput, GlFormGroup } from '@gitlab/ui';
+import _ from 'underscore';
 import { __, sprintf } from '~/locale';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 import autofocusonshow from '~/vue_shared/directives/autofocusonshow';
@@ -23,6 +24,7 @@ export default {
       'markdownDocsPath',
       'markdownPreviewPath',
       'releasesPagePath',
+      'updateReleaseApiDocsPath',
     ]),
     showForm() {
       return !this.isFetchingRelease && !this.fetchError;
@@ -42,6 +44,20 @@ export default {
     tagName() {
       return this.$store.state.release.tagName;
     },
+    tagNameHintText() {
+      return sprintf(
+        __(
+          'Changing a Release tag is only supported via Releases API. %{linkStart}More information%{linkEnd}',
+        ),
+        {
+          linkStart: `<a href="${_.escape(
+            this.updateReleaseApiDocsPath,
+          )}" target="_blank" rel="noopener noreferrer">`,
+          linkEnd: '</a>',
+        },
+        false,
+      );
+    },
     releaseTitle: {
       get() {
         return this.$store.state.release.name;
@@ -77,22 +93,22 @@ export default {
   <div class="d-flex flex-column">
     <p class="pt-3 js-subtitle-text" v-html="subtitleText"></p>
     <form v-if="showForm" @submit.prevent="updateRelease()">
-      <div class="row">
-        <gl-form-group class="col-md-6 col-lg-5 col-xl-4">
-          <label for="git-ref">{{ __('Tag name') }}</label>
-          <gl-form-input
-            id="git-ref"
-            v-model="tagName"
-            type="text"
-            class="form-control"
-            aria-describedby="tag-name-help"
-            disabled
-          />
-          <div id="tag-name-help" class="form-text text-muted">
-            {{ __('Choose an existing tag, or create a new one') }}
+      <gl-form-group>
+        <div class="row">
+          <div class="col-md-6 col-lg-5 col-xl-4">
+            <label for="git-ref">{{ __('Tag name') }}</label>
+            <gl-form-input
+              id="git-ref"
+              v-model="tagName"
+              type="text"
+              class="form-control"
+              aria-describedby="tag-name-help"
+              disabled
+            />
           </div>
-        </gl-form-group>
-      </div>
+        </div>
+        <div id="tag-name-help" class="form-text text-muted" v-html="tagNameHintText"></div>
+      </gl-form-group>
       <gl-form-group>
         <label for="release-title">{{ __('Release title') }}</label>
         <gl-form-input
diff --git a/app/assets/javascripts/releases/detail/store/state.js b/app/assets/javascripts/releases/detail/store/state.js
index ff98e2bed78..7e3d975f1ae 100644
--- a/app/assets/javascripts/releases/detail/store/state.js
+++ b/app/assets/javascripts/releases/detail/store/state.js
@@ -4,6 +4,7 @@ export default () => ({
   releasesPagePath: null,
   markdownDocsPath: null,
   markdownPreviewPath: null,
+  updateReleaseApiDocsPath: null,
 
   release: null,