Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/members.js b/app/assets/javascripts/members.js
index 252706b3647..6dd4018f87a 100644
--- a/app/assets/javascripts/members.js
+++ b/app/assets/javascripts/members.js
@@ -77,13 +77,19 @@ export default class Members {
 
       $expiresInText.text(sprintf(__('Expires in %{expires_at}'), { expires_at: expiresIn }));
 
-      const { expires_soon: expiresSoon } = data;
+      const { expires_soon: expiresSoon, expires_at_formatted: expiresAtFormatted } = data;
 
       if (expiresSoon) {
         $expiresInText.addClass('text-warning');
       } else {
         $expiresInText.removeClass('text-warning');
       }
+
+      // Update tooltip
+      if (expiresAtFormatted) {
+        $expiresInText.attr('title', expiresAtFormatted);
+        $expiresInText.attr('data-original-title', expiresAtFormatted);
+      }
     } else {
       $expiresIn.addClass('gl-display-none');
     }