summaryrefslogtreecommitdiff
path: root/app/views/profiles
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-03 15:08:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-03 15:08:43 +0000
commitdbe0e5676267eb142dd8d81e4c881c997cb96962 (patch)
tree765b50588c3c1540297dc6a76eea1122dd59cdac /app/views/profiles
parent14a32c2d551a646525b1fabd93cb70a0e6924478 (diff)
downloadgitlab-ce-dbe0e5676267eb142dd8d81e4c881c997cb96962.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles')
-rw-r--r--app/views/profiles/show.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index e10c39b1a44..659b218bdef 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -53,7 +53,9 @@
= status_form.hidden_field :emoji, data: { js_name: 'emoji' }
= status_form.hidden_field :message, data: { js_name: 'message' }
= status_form.hidden_field :availability, data: { js_name: 'availability' }
- = status_form.hidden_field :clear_status_after, value: @user.status&.clear_status_at&.to_s(:iso8601), data: { js_name: 'clearStatusAfter' }
+ = status_form.hidden_field :clear_status_after,
+ value: user_clear_status_at(@user),
+ data: { js_name: 'clearStatusAfter' }
.col-lg-12
%hr
.row.user-time-preferences.js-search-settings-section