diff --git a/Gemfile.lock b/Gemfile.lock index 3897c64d9..86eaa8f94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM bullet (6.1.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (11.1.0) + byebug (11.1.1) cancancan (3.0.2) capybara (3.30.0) addressable @@ -160,18 +160,18 @@ GEM discard (1.1.0) activerecord (>= 4.2, < 7) docile (1.1.5) - elasticsearch (6.8.0) - elasticsearch-api (= 6.8.0) - elasticsearch-transport (= 6.8.0) - elasticsearch-api (6.8.0) + elasticsearch (6.8.1) + elasticsearch-api (= 6.8.1) + elasticsearch-transport (= 6.8.1) + elasticsearch-api (6.8.1) multi_json elasticsearch-model (7.0.0) activesupport (> 3) elasticsearch (> 1) hashie elasticsearch-rails (6.0.0) - elasticsearch-transport (6.8.0) - faraday + elasticsearch-transport (6.8.1) + faraday (>= 0.14, < 1) multi_json equalizer (0.0.11) erubi (1.9.0) diff --git a/app/views/home/_harvests.html.haml b/app/views/home/_harvests.html.haml index b8d23f9be..6e25c0a4c 100644 --- a/app/views/home/_harvests.html.haml +++ b/app/views/home/_harvests.html.haml @@ -7,6 +7,6 @@ %h5= harvest.crop_name %span.badge.badge-success=harvest.plant_part %small.text-muted - harvested by #{harvest.owner_name} + harvested by #{harvest.owner_login_name} %p.mb-2 - = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow' \ No newline at end of file + = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow' diff --git a/app/views/home/_plantings.html.haml b/app/views/home/_plantings.html.haml index a3bb79f75..797391927 100644 --- a/app/views/home/_plantings.html.haml +++ b/app/views/home/_plantings.html.haml @@ -8,4 +8,4 @@ %h5= planting['crop_name'] - if planting['planted_from'].present? %span.badge.badge-success= planting['planted_from'].pluralize - %small.text-muted planted by #{planting['owner_name']} + %small.text-muted planted by #{planting['owner_login_name']}