From 6c0462eed609e7ea4db6ed8cdcd619d64d7e3f57 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 07:37:25 +0000 Subject: [PATCH 1/2] Bump faker from 2.7.0 to 2.8.0 Bumps [faker](https://github.com/faker-ruby/faker) from 2.7.0 to 2.8.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.7.0...v2.8.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 059e7a2ab..894c6e576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM factory_bot_rails (5.1.1) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faker (2.7.0) + faker (2.8.0) i18n (>= 1.6, < 1.8) faraday (0.17.1) multipart-post (>= 1.2, < 3) From 9e87787977737e94392e5fd68d9001da592230ef Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 3 Dec 2019 21:48:15 +1300 Subject: [PATCH 2/2] Fix color of crop action links --- app/views/crops/_actions.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/crops/_actions.html.haml b/app/views/crops/_actions.html.haml index 835edea1c..0cdb116db 100644 --- a/app/views/crops/_actions.html.haml +++ b/app/views/crops/_actions.html.haml @@ -1,6 +1,6 @@ - if crop.approved? && signed_in? %ul.nav.crop-actions - %li.nav-item.dropdown.btn.btn-sm + %li.nav-item.dropdown %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Add to garden .dropdown-menu.dropdown-secondary - current_member.gardens.active.each do |garden| @@ -8,13 +8,13 @@ = garden.name .dropdown-divider = link_to 'add new garden', new_garden_path, class: 'dropdown-item' - %li.nav-item.dropdown.btn.btn-sm + %li.nav-item.dropdown %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Record harvest .dropdown-menu.dropdown-secondary - PlantPart.all.each do |plant_part| = link_to harvests_path(harvest: {crop_id: crop.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do = plant_part.name - %li.nav-item.dropdown.btn.btn-sm + %li.nav-item.dropdown %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'}=t('buttons.save_seeds', crop_name: crop.name) .dropdown-menu.dropdown-secondary - Seed::TRADABLE_TO_VALUES.each do |trade|