From 63b8554435eae8d647a3bfc02404666d521ed976 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 9 Feb 2019 15:16:53 +1300 Subject: [PATCH 1/6] Added missing semicolon --- app/assets/javascripts/tooltips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/tooltips.js b/app/assets/javascripts/tooltips.js index ba32b627d..4c847cdfc 100644 --- a/app/assets/javascripts/tooltips.js +++ b/app/assets/javascripts/tooltips.js @@ -1,3 +1,3 @@ $(function () { - $('[data-toggle="tooltip"]').tooltip() + $('[data-toggle="tooltip"]').tooltip(); }); From 93835b3ee62cacf71dee1d517ca3651cc7f5f320 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 9 Feb 2019 15:21:30 +1300 Subject: [PATCH 2/6] Javascript lint --- app/assets/javascripts/tooltips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/tooltips.js b/app/assets/javascripts/tooltips.js index 4c847cdfc..fe6e69830 100644 --- a/app/assets/javascripts/tooltips.js +++ b/app/assets/javascripts/tooltips.js @@ -1,3 +1,3 @@ -$(function () { +$(function() { $('[data-toggle="tooltip"]').tooltip(); }); From 80f0f41026f023764cb1e3c8ca71448202af2a50 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 12 Feb 2019 11:51:16 +1300 Subject: [PATCH 3/6] removed commented out code --- app/views/plantings/_quick_actions.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/plantings/_quick_actions.haml b/app/views/plantings/_quick_actions.haml index 24371cdf0..5a8b02c3e 100644 --- a/app/views/plantings/_quick_actions.haml +++ b/app/views/plantings/_quick_actions.haml @@ -11,6 +11,3 @@ %li= planting_finish_button(planting) %li= planting_harvest_button(planting) %li= planting_save_seeds_button(planting) - - -# - if can? :destroy, planting - -# %li= delete_button(planting) From e9c2454799b9850d8e91b308a449bdd516918294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Feb 2019 10:22:19 +0000 Subject: [PATCH 4/6] Bump rubocop from 0.61.1 to 0.64.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.1 to 0.64.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.1...v0.64.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 70af7c8bc..0eaa9f876 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.61.1) + rubocop (0.64.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) From 1d96b11c799b3900c4198dcb5ceae38c650f061f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Feb 2019 10:42:40 +0000 Subject: [PATCH 5/6] Bump rspec-rails from 3.8.1 to 3.8.2 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0eaa9f876..c41fb031b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -406,7 +406,7 @@ GEM rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.1) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) From d0e46363b6aeb44f5e601b4f7975de984804dbdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Feb 2019 11:04:47 +0000 Subject: [PATCH 6/6] Bump faker from 1.9.1 to 1.9.2 Bumps [faker](https://github.com/stympy/faker) from 1.9.1 to 1.9.2. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c41fb031b..e00ef2345 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (1.9.1) + faker (1.9.2) i18n (>= 0.7) faraday (0.15.4) multipart-post (>= 1.2, < 3)