Merge remote-tracking branch 'upstream/pull/2136'

[rails.git] / app / models / changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 4d305ea4460fabc165d5f8d3e8905e0082ff393a..5cdfeb994544444f08edb72cc4f8ba42fead569d 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -208,7 +208,7 @@ class Changeset < ActiveRecord::Base
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 

-    if user_display_name_cache && user_display_name_cache.key?(user_id)
+    if user_display_name_cache&.key?(user_id)

       # use the cache if available
     elsif user.data_public?
       user_display_name_cache[user_id] = user.display_name
       # use the cache if available
     elsif user.data_public?
       user_display_name_cache[user_id] = user.display_name