diff options
author | Stan Hu <stanhu@gmail.com> | 2019-03-13 21:03:12 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-03-13 21:03:12 +0300 |
commit | c048422fa23b988ecdb87858cd58766870347bbe (patch) | |
tree | c07a1507ff5192f911704fcc77026d7f4043dd0e /app/serializers | |
parent | 42b7f53bb8c456e2a88f6abff1ea8fc5dc5c4b2e (diff) | |
parent | 9f05e97aad33a0cd70862f67101bdcb3fddc639a (diff) |
Merge branch 'update-rubocop' into 'master'
Update rubocop target ruby version
See merge request gitlab-org/gitlab-ce!24804
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/detailed_status_entity.rb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/serializers/detailed_status_entity.rb b/app/serializers/detailed_status_entity.rb index da994d78286..4f23ef0ed82 100644 --- a/app/serializers/detailed_status_entity.rb +++ b/app/serializers/detailed_status_entity.rb @@ -9,16 +9,14 @@ class DetailedStatusEntity < Grape::Entity expose :details_path expose :illustration do |status| - begin - illustration = { - image: ActionController::Base.helpers.image_path(status.illustration[:image]) - } - illustration = status.illustration.merge(illustration) + illustration = { + image: ActionController::Base.helpers.image_path(status.illustration[:image]) + } + illustration = status.illustration.merge(illustration) - illustration - rescue NotImplementedError - # ignored - end + illustration + rescue NotImplementedError + # ignored end expose :favicon do |status| |