From 2a55f61a4c948a3af8d25a1a95405d42ec443e00 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 1 Sep 2019 16:29:50 +1200 Subject: [PATCH 1/8] Section padding fixes #2105 --- app/assets/stylesheets/overrides.scss | 2 +- app/views/plantings/show.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss index 79db1fb4a..08949e555 100755 --- a/app/assets/stylesheets/overrides.scss +++ b/app/assets/stylesheets/overrides.scss @@ -4,8 +4,8 @@ body { } section { - padding-top: 1em; margin: 0; + padding-bottom: 1em; } .ellipsis { diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml index 2554a9421..160c7d031 100644 --- a/app/views/plantings/show.html.haml +++ b/app/views/plantings/show.html.haml @@ -36,6 +36,6 @@ .row .col-md-12 %hr/ - = render 'plantings/harvests', planting: @planting + %section= render 'plantings/harvests', planting: @planting %hr/ - = render 'plantings/descendants', planting: @planting + %section= render 'plantings/descendants', planting: @planting From 82e2b56b0d2c1fc4952981c7129a98ab5f8b8308 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:49:57 +0000 Subject: [PATCH 2/8] Bump faker from 2.2.0 to 2.2.1 Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.0 to 2.2.1. - [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.2.0...v2.2.1) 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 035b15fe6..eb620c456 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM factory_bot_rails (5.0.2) factory_bot (~> 5.0.2) railties (>= 4.2.0) - faker (2.2.0) + faker (2.2.1) i18n (>= 0.8) faraday (0.15.4) multipart-post (>= 1.2, < 3) From a866c1f991f5a4ec6f89ac21f84ddd1c3578aeac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:56:33 +0000 Subject: [PATCH 3/8] Bump oj from 3.9.0 to 3.9.1 Bumps [oj](https://github.com/ohler55/oj) from 3.9.0 to 3.9.1. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1) 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 eb620c456..ca827a710 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.9.0) + oj (3.9.1) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) From 1ad256efa2517e16933930fe47c9517cd525be43 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:51:52 +0000 Subject: [PATCH 4/8] Bump csv_shaper from 1.3.0 to 1.3.1 Bumps [csv_shaper](https://github.com/paulspringett/csv_shaper) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/paulspringett/csv_shaper/releases) - [Commits](https://github.com/paulspringett/csv_shaper/compare/v1.3.0...v1.3.1) 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 ca827a710..431d43676 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,7 +150,7 @@ GEM thor (~> 0.19.1) tins (~> 1.6) crass (1.0.4) - csv_shaper (1.3.0) + csv_shaper (1.3.1) activesupport (>= 3.0.0) dalli (2.7.10) database_cleaner (1.7.0) From 6af25d2d63e82466c3e8c73db09e498cdc14843e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:51:04 +0000 Subject: [PATCH 5/8] Bump rubocop-rails from 2.3.1 to 2.3.2 Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 431d43676..e84d9bc99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,7 +359,7 @@ GEM rack orm_adapter (0.5.0) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.0) ast (~> 2.4.0) percy-capybara (4.0.2) pg (0.21.0) @@ -464,7 +464,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.3.1) + rubocop-rails (2.3.2) rack (>= 1.1) rubocop (>= 0.72.0) rubocop-rspec (1.35.0) From 64f2d208d4b189d48523cc31d5690b428cad3d02 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:54:40 +0000 Subject: [PATCH 6/8] Bump selenium-webdriver from 3.142.3 to 3.142.4 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.3 to 3.142.4. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e84d9bc99..3fd0a36c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,7 +113,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) chartkick (3.2.1) - childprocess (1.0.1) + childprocess (2.0.0) rake (< 13.0) codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) @@ -500,8 +500,8 @@ GEM activemodel (>= 5) elasticsearch (>= 6) hashie - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) + selenium-webdriver (3.142.4) + childprocess (>= 0.5, < 3.0) rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.12.1) sidekiq (5.2.7) From 95c7fa2d939983d613ef4ed9e0f53796f31da634 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 09:52:49 +0000 Subject: [PATCH 7/8] Bump sidekiq from 5.2.7 to 6.0.0 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3fd0a36c9..37a8dfdb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -504,11 +504,11 @@ GEM childprocess (>= 0.5, < 3.0) rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.12.1) - sidekiq (5.2.7) - connection_pool (~> 2.2, >= 2.2.2) - rack (>= 1.5.0) - rack-protection (>= 1.5.0) - redis (>= 3.3.5, < 5) + sidekiq (6.0.0) + connection_pool (>= 2.2.2) + rack (>= 2.0.0) + rack-protection (>= 2.0.0) + redis (>= 4.1.0) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) From fedfd4fd08d31ed870f2ae7a8b61de33480bf93e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 08:18:47 +0000 Subject: [PATCH 8/8] Bump capybara from 3.28.0 to 3.29.0 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.28.0 to 3.29.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.28.0...3.29.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37a8dfdb8..13d8af9d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,8 +57,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) anima (0.3.1) abstract_type (~> 0.0.7) adamantium (~> 0.2) @@ -94,7 +94,7 @@ GEM uniform_notifier (~> 1.11) byebug (11.0.1) cancancan (3.0.1) - capybara (3.28.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -368,7 +368,7 @@ GEM moneta (~> 1.0.0) popper_js (1.14.5) procto (0.0.3) - public_suffix (3.1.1) + public_suffix (4.0.1) puma (4.1.0) nio4r (~> 2.0) rack (2.0.7)