diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-20 22:41:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 22:41:20 +0100 |
| commit | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (patch) | |
| tree | e4be53cb0b2e7f876bea6c61d4fe64d7586ae63d /app/lib/admin/metrics | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | dc0cc5a57d224b4c53bc58dad919b727055bd9a3 (diff) | |
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/admin/metrics')
| -rw-r--r-- | app/lib/admin/metrics/dimension/software_versions_dimension.rb | 12 | ||||
| -rw-r--r-- | app/lib/admin/metrics/dimension/space_usage_dimension.rb | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb index 816615f99..9ab3776c9 100644 --- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb +++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb @@ -58,12 +58,10 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim end def redis_info - @redis_info ||= begin - if redis.is_a?(Redis::Namespace) - redis.redis.info - else - redis.info - end - end + @redis_info ||= if redis.is_a?(Redis::Namespace) + redis.redis.info + else + redis.info + end end end diff --git a/app/lib/admin/metrics/dimension/space_usage_dimension.rb b/app/lib/admin/metrics/dimension/space_usage_dimension.rb index 5867c5bab..cc8560890 100644 --- a/app/lib/admin/metrics/dimension/space_usage_dimension.rb +++ b/app/lib/admin/metrics/dimension/space_usage_dimension.rb @@ -59,12 +59,10 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension end def redis_info - @redis_info ||= begin - if redis.is_a?(Redis::Namespace) - redis.redis.info - else - redis.info - end - end + @redis_info ||= if redis.is_a?(Redis::Namespace) + redis.redis.info + else + redis.info + end end end |