Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 17 deletions

diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue b/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
index d05e0d8610e..cc0af0b9ab7 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
@@ -6,7 +6,6 @@ export default {
   components: {
     GlLink,
     GlSprintf,
-    SignInOauthButton: () => import('./sign_in_oauth_button.vue'),
   },
   inject: {
     gitlabUserPath: {
@@ -14,14 +13,6 @@ export default {
     },
   },
   props: {
-    userSignedIn: {
-      type: Boolean,
-      required: true,
-    },
-    hasSubscriptions: {
-      type: Boolean,
-      required: true,
-    },
     user: {
       type: Object,
       required: false,
@@ -45,7 +36,6 @@ export default {
     },
   },
   i18n: {
-    signInText: __('Sign in to GitLab'),
     signedInAsUserText: __('Signed in to GitLab as %{user_link}'),
     signedInText: __('Signed in to GitLab'),
   },
@@ -53,18 +43,12 @@ export default {
 </script>
 <template>
   <div class="gl-font-base">
-    <gl-sprintf v-if="userSignedIn" :message="signedInText">
+    <gl-sprintf :message="signedInText">
       <template #user_link>
         <gl-link data-testid="gitlab-user-link" :href="gitlabUserLink" target="_blank">
           {{ gitlabUserHandle }}
         </gl-link>
       </template>
     </gl-sprintf>
-
-    <template v-else-if="hasSubscriptions">
-      <sign-in-oauth-button category="tertiary">
-        {{ $options.i18n.signInText }}
-      </sign-in-oauth-button>
-    </template>
   </div>
 </template>