Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 2 deletions

diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 4a218984af1..9bcabd7d9c6 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -175,7 +175,7 @@ module PageLayoutHelper
       current_emoji: user.status.emoji.to_s,
       current_message: user.status.message.to_s,
       current_availability: user.status.availability.to_s,
-      current_clear_status_after: user.status.clear_status_at&.to_s(:iso8601)
+      current_clear_status_after: user_clear_status_at(user)
     })
   end
 
diff --git a/app/helpers/sidebars_helper.rb b/app/helpers/sidebars_helper.rb
index 4f5f01efcc4..17ba56e8a67 100644
--- a/app/helpers/sidebars_helper.rb
+++ b/app/helpers/sidebars_helper.rb
@@ -50,7 +50,7 @@ module SidebarsHelper
         availability: user.status&.availability.to_s,
         emoji: user.status&.emoji,
         message: user.status&.message_html&.html_safe,
-        clear_after: user.status&.clear_status_at.to_s
+        clear_after: user_clear_status_at(user)
       },
       trial: {
         has_start_trial: current_user_menu?(:start_trial),
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 218e13f1e40..4c8765618d0 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -8,6 +8,13 @@ module UsersHelper
     }
   end
 
+  def user_clear_status_at(user)
+    # The user.status can be nil when the user has no status, so we need to protect against that case.
+    # iso8601 is the official RFC supported format for frontend parsing of date:
+    # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date
+    user.status&.clear_status_at&.to_s(:iso8601)
+  end
+
   def user_link(user)
     link_to(user.name, user_path(user),
             title: user.email,