diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-06-02 20:32:02 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-06-02 20:32:02 +0200 |
| commit | 0383b4822562005e20cdda80bca20a5fc11e9f8f (patch) | |
| tree | 9f6bdaea50d256ecf58f9ccfd49198019897a196 /app/serializers | |
| parent | b24651826f249cd1fcbd87d097c42488d0472611 (diff) | |
| parent | 11852e16387790c26be7b8d1dd99ed689bf9d45b (diff) | |
| download | gitlab-ce-0383b4822562005e20cdda80bca20a5fc11e9f8f.tar.gz | |
Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/entity_date_helper.rb | 2 | ||||
| -rw-r--r-- | app/serializers/user_entity.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/serializers/entity_date_helper.rb b/app/serializers/entity_date_helper.rb index 9607ad55a8b..71d9a65fb58 100644 --- a/app/serializers/entity_date_helper.rb +++ b/app/serializers/entity_date_helper.rb @@ -4,7 +4,7 @@ module EntityDateHelper def interval_in_words(diff) return 'Not started' unless diff - "#{distance_of_time_in_words(Time.now, diff)} ago" + distance_of_time_in_words(Time.now, diff, scope: 'datetime.time_ago_in_words') end # Converts seconds into a hash such as: diff --git a/app/serializers/user_entity.rb b/app/serializers/user_entity.rb index 43754ea94f7..876512b12dc 100644 --- a/app/serializers/user_entity.rb +++ b/app/serializers/user_entity.rb @@ -1,2 +1,7 @@ class UserEntity < API::Entities::UserBasic + include RequestAwareEntity + + expose :path do |user| + user_path(user) + end end |