Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 1 deletions

diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
index 44575455a34..ec42b533dd4 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
@@ -31,6 +31,9 @@ export default {
     subscriptionsPath: {
       default: '',
     },
+    publicKeyStorageEnabled: {
+      default: false,
+    },
   },
   computed: {
     ...mapState(['currentUser']),
@@ -144,6 +147,7 @@ export default {
           <sign-in-page
             v-show="!userSignedIn"
             :has-subscriptions="hasSubscriptions"
+            :public-key-storage-enabled="publicKeyStorageEnabled"
             @sign-in-oauth="onSignInOauth"
             @error="onSignInError"
           />
diff --git a/app/assets/javascripts/jira_connect/subscriptions/index.js b/app/assets/javascripts/jira_connect/subscriptions/index.js
index 8e9f73538b9..21ff85e58e2 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/index.js
+++ b/app/assets/javascripts/jira_connect/subscriptions/index.js
@@ -27,6 +27,7 @@ export function initJiraConnect() {
     usersPath,
     gitlabUserPath,
     oauthMetadata,
+    publicKeyStorageEnabled,
   } = el.dataset;
   sizeToParent();
 
@@ -42,6 +43,7 @@ export function initJiraConnect() {
       usersPath,
       gitlabUserPath,
       oauthMetadata: oauthMetadata ? JSON.parse(oauthMetadata) : null,
+      publicKeyStorageEnabled,
     },
     render(createElement) {
       return createElement(JiraConnectApp);
diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue
index 37d40071dd0..e6a94ffbaa4 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue
@@ -12,10 +12,14 @@ export default {
       type: Boolean,
       required: true,
     },
+    publicKeyStorageEnabled: {
+      type: Boolean,
+      required: true,
+    },
   },
   computed: {
     isOauthSelfManagedEnabled() {
-      return this.glFeatures.jiraConnectOauth;
+      return this.glFeatures.jiraConnectOauth && this.publicKeyStorageEnabled;
     },
   },
 };