pfischbeck/projekteuler
1
0
Fork 0
mirror of https://github.com/projekteuler/projekteuler.git synced 2025-12-10 08:46:41 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
Bump font-awesome-sass from 5.15.1 to 6.2.0
This commit is contained in:
Philipp Fischbeck 2022-11-14 21:18:43 +01:00 committed by GitHub
commit b37303fd72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -6,7 +6,7 @@ gem 'rails', '7.0.4'
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 6.0' gem 'puma', '~> 6.0'
# Use sqlite3 as the database for Active Record # 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 gem 'mysql2', '~> 0.5.2', group: :production
@ -41,7 +41,7 @@ gem 'listen', '~> 3.7.0', group: :development
gem 'bootstrap', '~> 5.1.3' gem 'bootstrap', '~> 5.1.3'
gem "bootstrap_form", "~> 5.0" 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 # Use Diffy for showing translation diffs
gem 'diffy' gem 'diffy'

11
Gemfile.lock
View File

@ -128,8 +128,8 @@ GEM
faraday-rack (1.0.0) faraday-rack (1.0.0)
faraday-retry (1.0.3) faraday-retry (1.0.3)
ffi (1.15.5) ffi (1.15.5)
font-awesome-sass (5.15.1) font-awesome-sass (6.2.0)
sassc (>= 1.11) sassc (~> 2.0)
globalid (1.0.0) globalid (1.0.0)
activesupport (>= 5.0) activesupport (>= 5.0)
hashdiff (1.0.1) hashdiff (1.0.1)
@ -276,7 +276,8 @@ GEM
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.2) sqlite3 (1.5.3)
mini_portile2 (~> 2.8.0)
stringio (3.0.2) stringio (3.0.2)
strscan (3.0.4) strscan (3.0.4)
thor (1.2.1) thor (1.2.1)
@ -320,7 +321,7 @@ DEPENDENCIES
devise (~> 4.8.0) devise (~> 4.8.0)
diff-lcs diff-lcs
diffy diffy
font-awesome-sass (~> 5.15.1) font-awesome-sass (~> 6.2.0)
jbuilder (~> 2.11.3) jbuilder (~> 2.11.3)
jquery-rails (~> 4.4.0) jquery-rails (~> 4.4.0)
listen (~> 3.7.0) listen (~> 3.7.0)
@ -335,7 +336,7 @@ DEPENDENCIES
rails-i18n (~> 7.0.6) rails-i18n (~> 7.0.6)
sassc-rails (~> 2.1.2) sassc-rails (~> 2.1.2)
sdoc (~> 2.4.0) sdoc (~> 2.4.0)
sqlite3 (~> 1.4.1) sqlite3 (~> 1.5.3)
turbolinks (~> 5.2.1) turbolinks (~> 5.2.1)
tzinfo-data tzinfo-data
uglifier (~> 4.2.0) uglifier (~> 4.2.0)

1
app/assets/stylesheets/application.css.scss
View File

@ -17,7 +17,6 @@
@import "bootstrap"; @import "bootstrap";
@import "rails_bootstrap_forms"; @import "rails_bootstrap_forms";
@import "font-awesome-sprockets";
@import "font-awesome"; @import "font-awesome";
.turbolinks-progress-bar { .turbolinks-progress-bar {