diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:08:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:08:29 +0300 |
| commit | 842ac3526cba09feb4b9ccefd0aeeb6edc02035d (patch) | |
| tree | 2b73dca2be277685aefdc4f775c211049b4dae7c /app/models/user_custom_attribute.rb | |
| parent | 9f9dc2bc412632e6b459d0bb9e1ac205c8cf34af (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user_custom_attribute.rb')
| -rw-r--r-- | app/models/user_custom_attribute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user_custom_attribute.rb b/app/models/user_custom_attribute.rb index 0db419c14b8..62614a851c1 100644 --- a/app/models/user_custom_attribute.rb +++ b/app/models/user_custom_attribute.rb @@ -7,8 +7,8 @@ class UserCustomAttribute < ApplicationRecord validates :key, uniqueness: { scope: [:user_id] } def self.upsert_custom_attributes(custom_attributes) - created_at = Date.today - updated_at = Date.today + created_at = DateTime.now + updated_at = DateTime.now custom_attributes.map! do |custom_attribute| custom_attribute.merge({ created_at: created_at, updated_at: updated_at }) |