Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 09:07:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 09:07:27 +0300
commit510bc67dd2222ef511c08aff145cce2317d280df (patch)
treec5c60b0e824631ee576d0e15ebbf293341f53158 /app/helpers
parented0dc960f6e0ec6d8e3de6925129b8db76647f4d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/page_layout_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 6f7b2877100..4a218984af1 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
+ current_clear_status_after: user.status.clear_status_at&.to_s(:iso8601)
})
end