mirror of
https://github.com/projekteuler/projekteuler.git
synced 2025-12-10 00:36:42 +01:00
Merge commit 'a926be0f4801b1e03f10605438f079e7a0605e72' into dependabot/bundler/font-awesome-sass-6.2.0
# Conflicts: # Gemfile.lock
This commit is contained in:
commit
1818c766bb
8
Gemfile
8
Gemfile
@ -2,9 +2,9 @@ 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.5.3'
|
||||
|
||||
@ -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,7 +34,7 @@ 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
|
||||
|
||||
168
Gemfile.lock
168
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)
|
||||
@ -134,9 +134,8 @@ GEM
|
||||
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)
|
||||
@ -157,8 +156,8 @@ GEM
|
||||
method_source (1.0.0)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.15.0)
|
||||
msgpack (1.4.4)
|
||||
minitest (5.16.3)
|
||||
msgpack (1.6.0)
|
||||
multi_json (1.15.0)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.1.1)
|
||||
@ -174,8 +173,7 @@ GEM
|
||||
digest
|
||||
net-protocol
|
||||
timeout
|
||||
net-protocol (0.1.2)
|
||||
io-wait
|
||||
net-protocol (0.1.3)
|
||||
timeout
|
||||
net-smtp (0.3.1)
|
||||
digest
|
||||
@ -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)
|
||||
@ -280,15 +278,15 @@ GEM
|
||||
sprockets (>= 3.0.0)
|
||||
sqlite3 (1.5.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
stringio (3.0.1)
|
||||
strscan (3.0.1)
|
||||
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)
|
||||
@ -310,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
|
||||
@ -332,12 +330,12 @@ 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)
|
||||
sdoc (~> 2.4.0)
|
||||
sqlite3 (~> 1.5.3)
|
||||
turbolinks (~> 5.2.1)
|
||||
tzinfo-data
|
||||
|
||||
Loading…
Reference in New Issue
Block a user