Merge pull request #286 from projekteuler/dependabot/bundler/font-awesome-sass-6.2.0

Bump font-awesome-sass from 5.15.1 to 6.2.0
Merge commit 'a926be0f4801b1e03f10605438f079e7a0605e72' into dependabot/bundler/font-awesome-sass-6.2.0
2025-12-10 08:46:41 +01:00 · 2022-11-14 21:18:43 +01:00 · 2022-11-14 21:14:26 +01:00 · 2022-11-14 21:10:18 +01:00 · 2022-11-14 21:09:59 +01:00 · 2022-11-14 20:54:03 +01:00
3 changed files with 98 additions and 100 deletions
--- a/12
+++ b/12
@ -2,11 +2,11 @@ source 'https://rubygems.org'


 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '7.0.1'
+gem 'rails', '7.0.4'
 # Use Puma as the app server
-gem 'puma', '~> 5.5'
+gem 'puma', '~> 6.0'
 # 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

@ -21,7 +21,7 @@ gem 'coffee-rails', '~> 5.0.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby

-gem 'rails-i18n', '~> 7.0.1'
+gem 'rails-i18n', '~> 7.0.6'

 gem 'rails-controller-testing'

@ -34,14 +34,14 @@ gem 'turbolinks', '~> 5.2.1'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.11.3'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 2.2.0',          group: :doc
+gem 'sdoc', '~> 2.4.0',          group: :doc

 gem 'web-console', '~> 4.2.0', group: :development
 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'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,67 +1,67 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    actioncable (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailbox (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.1)
-      actionpack (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailer (7.0.4)
+      actionpack (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activesupport (= 7.0.4)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
      rack (~> 2.0, >= 2.2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.1)
-      actionpack (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actiontext (7.0.4)
+      actionpack (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.1)
-      activesupport (= 7.0.1)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.1)
-      activesupport (= 7.0.1)
+    activejob (7.0.4)
+      activesupport (= 7.0.4)
      globalid (>= 0.3.6)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activestorage (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activesupport (= 7.0.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activestorage (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activesupport (= 7.0.4)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (7.0.1)
+    activesupport (7.0.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -72,7 +72,7 @@ GEM
      execjs (~> 2)
    bcrypt (3.1.16)
    bindex (0.8.1)
-    bootsnap (1.10.2)
+    bootsnap (1.13.0)
      msgpack (~> 1.2)
    bootstrap (5.1.3)
      autoprefixer-rails (>= 9.1.0)
@ -89,7 +89,7 @@ GEM
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
    crack (0.4.5)
      rexml
    crass (1.0.6)
@ -100,9 +100,9 @@ GEM
      responders
      warden (~> 1.2.3)
    diff-lcs (1.5.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
    digest (3.1.0)
-    erubi (1.10.0)
+    erubi (1.11.0)
    execjs (2.8.1)
    faraday (1.9.3)
      faraday-em_http (~> 1.0)
@ -128,15 +128,14 @@ 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)
    hashie (5.0.0)
-    i18n (1.9.1)
+    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
    jbuilder (2.11.5)
      actionview (>= 5.0.0)
      activesupport (>= 5.0.0)
@ -148,7 +147,7 @@ GEM
    listen (3.7.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.19.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@ -156,9 +155,9 @@ GEM
    marcel (1.0.2)
    method_source (1.0.0)
    mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
-    minitest (5.15.0)
-    msgpack (1.4.4)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    msgpack (1.6.0)
    multi_json (1.15.0)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
@ -174,16 +173,15 @@ GEM
      digest
      net-protocol
      timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
      timeout
    net-smtp (0.3.1)
      digest
      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)
@ -191,9 +189,9 @@ GEM
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+    omniauth (2.1.0)
      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
      rack-protection
    omniauth-github (2.0.0)
      omniauth (~> 2.0)
@ -201,36 +199,36 @@ GEM
    omniauth-oauth2 (1.7.2)
      oauth2 (~> 1.4)
      omniauth (>= 1.9, < 3)
-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)
      actionpack (>= 4.2)
      omniauth (~> 2.0)
    orm_adapter (0.5.0)
    popper_js (2.9.3)
-    psych (4.0.3)
+    psych (4.0.6)
      stringio
    public_suffix (4.0.6)
-    puma (5.6.1)
+    puma (6.0.0)
      nio4r (~> 2.0)
    racc (1.6.0)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack (2.2.4)
+    rack-protection (3.0.3)
      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (7.0.1)
-      actioncable (= 7.0.1)
-      actionmailbox (= 7.0.1)
-      actionmailer (= 7.0.1)
-      actionpack (= 7.0.1)
-      actiontext (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activemodel (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.4)
+      actioncable (= 7.0.4)
+      actionmailbox (= 7.0.4)
+      actionmailer (= 7.0.4)
+      actionpack (= 7.0.4)
+      actiontext (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activemodel (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
      bundler (>= 1.15.0)
-      railties (= 7.0.1)
+      railties (= 7.0.4)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@ -238,14 +236,14 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
      loofah (~> 2.3)
-    rails-i18n (7.0.1)
+    rails-i18n (7.0.6)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
-    railties (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@ -269,7 +267,7 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    sdoc (2.2.0)
+    sdoc (2.4.0)
      rdoc (>= 5.0)
    sprockets (4.0.2)
      concurrent-ruby (~> 1.0)
@ -278,16 +276,17 @@ GEM
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    stringio (3.0.1)
-    strscan (3.0.1)
+    sqlite3 (1.5.3)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.0.2)
+    strscan (3.0.4)
    thor (1.2.1)
    tilt (2.0.10)
-    timeout (0.2.0)
+    timeout (0.3.0)
    turbolinks (5.2.1)
      turbolinks-source (~> 5.2)
    turbolinks-source (5.2.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
      concurrent-ruby (~> 1.0)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
@ -309,7 +308,7 @@ GEM
    will_paginate (3.3.1)
    will_paginate-bootstrap4 (0.2.2)
      will_paginate (~> 3.0, >= 3.0.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)

 PLATFORMS
  ruby
@ -322,7 +321,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)
@ -331,13 +330,13 @@ DEPENDENCIES
  omniauth
  omniauth-github
  omniauth-rails_csrf_protection
-  puma (~> 5.5)
-  rails (= 7.0.1)
+  puma (~> 6.0)
+  rails (= 7.0.4)
  rails-controller-testing
-  rails-i18n (~> 7.0.1)
+  rails-i18n (~> 7.0.6)
  sassc-rails (~> 2.1.2)
-  sdoc (~> 2.2.0)
-  sqlite3 (~> 1.4.1)
+  sdoc (~> 2.4.0)
+  sqlite3 (~> 1.5.3)
  turbolinks (~> 5.2.1)
  tzinfo-data
  uglifier (~> 4.2.0)
--- 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 {
Author	SHA1	Message	Date
Philipp Fischbeck	b37303fd72	Merge pull request #286 from projekteuler/dependabot/bundler/font-awesome-sass-6.2.0 Bump font-awesome-sass from 5.15.1 to 6.2.0	2022-11-14 21:18:43 +01:00
Philipp Fischbeck	1818c766bb	Merge commit 'a926be0f4801b1e03f10605438f079e7a0605e72' into dependabot/bundler/font-awesome-sass-6.2.0 # Conflicts: # Gemfile.lock	2022-11-14 21:14:26 +01:00
Philipp Fischbeck	42514c633e	Fix extra font-awesome import	2022-11-14 21:10:18 +01:00
Philipp Fischbeck	a73a9b4a9b	Update sqlite3	2022-11-14 21:09:59 +01:00
Philipp Fischbeck	a926be0f48	Merge pull request #288 from projekteuler/dependabot/bundler/puma-6.0.0 Bump puma from 5.6.1 to 6.0.0	2022-11-14 20:54:03 +01:00
Philipp Fischbeck	d3cd187aa7	Merge pull request #283 from projekteuler/dependabot/bundler/bootsnap-1.13.0 Bump bootsnap from 1.10.2 to 1.13.0	2022-11-14 20:50:49 +01:00
Philipp Fischbeck	ba8573d611	Merge pull request #271 from projekteuler/dependabot/bundler/omniauth-2.1.0 Bump omniauth from 2.0.4 to 2.1.0	2022-11-14 20:44:51 +01:00
dependabot[bot]	06a13271e6	Bump puma from 5.6.1 to 6.0.0 Bumps [puma](https://github.com/puma/puma) from 5.6.1 to 6.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.1...v6.0.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:42:08 +00:00
Philipp Fischbeck	a21f963601	Merge pull request #290 from projekteuler/dependabot/bundler/rails-i18n-7.0.6 Bump rails-i18n from 7.0.1 to 7.0.6	2022-11-14 20:41:12 +01:00
dependabot[bot]	5fb0a14292	Bump rails-i18n from 7.0.1 to 7.0.6 Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.1 to 7.0.6. - [Release notes](https://github.com/svenfuchs/rails-i18n/releases) - [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/rails-i18n/commits/v7.0.6) --- updated-dependencies: - dependency-name: rails-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:37:35 +00:00
dependabot[bot]	4a76c81d32	Bump omniauth from 2.0.4 to 2.1.0 Bumps [omniauth](https://github.com/omniauth/omniauth) from 2.0.4 to 2.1.0. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v2.0.4...v2.1.0) --- updated-dependencies: - dependency-name: omniauth dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:36:57 +00:00
Philipp Fischbeck	cf8fe399b5	Merge pull request #254 from projekteuler/dependabot/bundler/omniauth-rails_csrf_protection-1.0.1 Bump omniauth-rails_csrf_protection from 1.0.0 to 1.0.1	2022-11-14 20:36:57 +01:00
Philipp Fischbeck	548b47640c	Merge pull request #275 from projekteuler/dependabot/bundler/sdoc-2.4.0 Bump sdoc from 2.2.0 to 2.4.0	2022-11-14 20:36:14 +01:00
Philipp Fischbeck	8387832ab7	Merge pull request #279 from projekteuler/dependabot/bundler/diffy-3.4.2 Bump diffy from 3.4.0 to 3.4.2	2022-11-14 20:32:32 +01:00
dependabot[bot]	0c9da40226	Bump bootsnap from 1.10.2 to 1.13.0 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.10.2 to 1.13.0. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.2...v1.13.0) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:27:18 +00:00
dependabot[bot]	aac0e0d337	Bump diffy from 3.4.0 to 3.4.2 Bumps [diffy](https://github.com/samg/diffy) from 3.4.0 to 3.4.2. - [Release notes](https://github.com/samg/diffy/releases) - [Changelog](https://github.com/samg/diffy/blob/main/CHANGELOG) - [Commits](https://github.com/samg/diffy/commits) --- updated-dependencies: - dependency-name: diffy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:27:11 +00:00
dependabot[bot]	2bb32f3702	Bump sdoc from 2.2.0 to 2.4.0 Bumps [sdoc](https://github.com/zzak/sdoc) from 2.2.0 to 2.4.0. - [Release notes](https://github.com/zzak/sdoc/releases) - [Changelog](https://github.com/zzak/sdoc/blob/master/CHANGELOG.md) - [Commits](https://github.com/zzak/sdoc/commits) --- updated-dependencies: - dependency-name: sdoc dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:27:06 +00:00
dependabot[bot]	73fc676286	Bump omniauth-rails_csrf_protection from 1.0.0 to 1.0.1 Bumps [omniauth-rails_csrf_protection](https://github.com/cookpad/omniauth-rails_csrf_protection) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/cookpad/omniauth-rails_csrf_protection/releases) - [Commits](https://github.com/cookpad/omniauth-rails_csrf_protection/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: omniauth-rails_csrf_protection dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 19:27:04 +00:00
Philipp Fischbeck	ab25a617d1	Merge pull request #287 from projekteuler/dependabot/bundler/rails-7.0.4 Bump rails from 7.0.1 to 7.0.4	2022-11-14 20:26:20 +01:00
dependabot[bot]	aa63654a4f	Bump rails from 7.0.1 to 7.0.4 Bumps [rails](https://github.com/rails/rails) from 7.0.1 to 7.0.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.0.1...v7.0.4) --- updated-dependencies: - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-09-12 15:01:37 +00:00
dependabot[bot]	bb2f0024f1	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] <support@github.com>	2022-09-05 16:36:56 +00:00