From bb2f0024f12b7ada7a7136f654c522ec9c100d46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:36:56 +0000 Subject: [PATCH 1/3] Bump font-awesome-sass from 5.15.1 to 6.2.0 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.15.1 to 6.2.0. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/commits) --- updated-dependencies: - dependency-name: font-awesome-sass dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 345d4c1..f11daa6 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'listen', '~> 3.7.0', group: :development gem 'bootstrap', '~> 5.1.3' gem "bootstrap_form", "~> 5.0" -gem 'font-awesome-sass', '~> 5.15.1' +gem 'font-awesome-sass', '~> 6.2.0' # Use Diffy for showing translation diffs gem 'diffy' diff --git a/Gemfile.lock b/Gemfile.lock index e3cb48e..15e6687 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,8 +128,8 @@ GEM faraday-rack (1.0.0) faraday-retry (1.0.3) ffi (1.15.5) - font-awesome-sass (5.15.1) - sassc (>= 1.11) + font-awesome-sass (6.2.0) + sassc (~> 2.0) globalid (1.0.0) activesupport (>= 5.0) hashdiff (1.0.1) @@ -322,7 +322,7 @@ DEPENDENCIES devise (~> 4.8.0) diff-lcs diffy - font-awesome-sass (~> 5.15.1) + font-awesome-sass (~> 6.2.0) jbuilder (~> 2.11.3) jquery-rails (~> 4.4.0) listen (~> 3.7.0) From a73a9b4a9bf1042c9fd43998ebda225e2830b194 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Mon, 14 Nov 2022 21:09:59 +0100 Subject: [PATCH 2/3] Update sqlite3 --- Gemfile | 2 +- Gemfile.lock | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f11daa6..b6ae9af 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '7.0.1' # Use Puma as the app server gem 'puma', '~> 5.5' # Use sqlite3 as the database for Active Record -gem 'sqlite3', '~> 1.4.1' +gem 'sqlite3', '~> 1.5.3' gem 'mysql2', '~> 0.5.2', group: :production diff --git a/Gemfile.lock b/Gemfile.lock index 15e6687..ff59097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,7 +156,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.7.1) + mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.4.4) multi_json (1.15.0) @@ -182,8 +182,8 @@ GEM net-protocol timeout nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) @@ -278,7 +278,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.5.3) + mini_portile2 (~> 2.8.0) stringio (3.0.1) strscan (3.0.1) thor (1.2.1) @@ -337,7 +338,7 @@ DEPENDENCIES rails-i18n (~> 7.0.1) sassc-rails (~> 2.1.2) sdoc (~> 2.2.0) - sqlite3 (~> 1.4.1) + sqlite3 (~> 1.5.3) turbolinks (~> 5.2.1) tzinfo-data uglifier (~> 4.2.0) From 42514c633e7ed4a730a45808b1557ad78a6e933a Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Mon, 14 Nov 2022 21:10:18 +0100 Subject: [PATCH 3/3] Fix extra font-awesome import --- app/assets/stylesheets/application.css.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 4ee9c55..cb64789 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -17,7 +17,6 @@ @import "bootstrap"; @import "rails_bootstrap_forms"; -@import "font-awesome-sprockets"; @import "font-awesome"; .turbolinks-progress-bar {