diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 18:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 18:08:43 +0300 |
commit | dbe0e5676267eb142dd8d81e4c881c997cb96962 (patch) | |
tree | 765b50588c3c1540297dc6a76eea1122dd59cdac /app/helpers/page_layout_helper.rb | |
parent | 14a32c2d551a646525b1fabd93cb70a0e6924478 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r-- | app/helpers/page_layout_helper.rb | 2 |
1 files changed, 1 insertions, 1 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 |