From fb77097611bf666ebeaa0bc7e8d01a1dc95e0b05 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 24 Feb 2020 09:28:30 +1300 Subject: [PATCH 1/4] Adding scss-lint --- .codeclimate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index aa58b474f..b6065a6ab 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,5 +1,7 @@ version: "2" plugins: + brakeman: + enabled: true brakeman: enabled: true bundler-audit: From 517cd82c5c339451e9ea5ea6635b4371581931da Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 24 Feb 2020 09:42:56 +1300 Subject: [PATCH 2/4] Foundation 6 upgrade --- app/assets/javascripts/application.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c8fc83829..3b6d5a9e3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -70,3 +70,5 @@ if (!isDNT) { $(function() { $(document).foundation(); }); + +$(function(){ $(document).foundation(); }); From 8e8e5081f0db3e9364e4c23c623c0adeb0a4e03e Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 16 Mar 2020 15:33:58 +1300 Subject: [PATCH 3/4] Gem update --- Gemfile.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9e8cf8b1..5109c9edf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,7 +130,7 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -139,7 +139,7 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) daemons (1.3.1) database_cleaner (1.8.2) debug_inspector (0.0.3) @@ -195,9 +195,10 @@ GEM ffi (1.12.2) font-awesome-sass (5.12.0) sassc (>= 1.11) - foundation-rails (5.5.2.1) + foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0, < 3.5) + sass (>= 3.3.0) + sprockets-es6 (>= 0.9.0) gh (0.15.1) addressable (~> 2.4.0) backports @@ -274,7 +275,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) moneta (1.0.0) mongo (2.11.2) bson (>= 4.6.0, < 5.0.0) @@ -309,7 +310,7 @@ GEM net-http-pipeline (1.0.1) ng-rails-csrf (0.1.0) nio4r (2.5.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) paperclip (6.1.0) From 87f448b2ee5dd76a2d85567239b62ccb6163815f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 16 Mar 2020 15:37:40 +1300 Subject: [PATCH 4/4] Remove extra foundation init --- app/assets/javascripts/application.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3b6d5a9e3..c8fc83829 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -70,5 +70,3 @@ if (!isDNT) { $(function() { $(document).foundation(); }); - -$(function(){ $(document).foundation(); });