mirror of
https://github.com/projekteuler/projekteuler.git
synced 2026-01-26 18:18:51 +01:00
Merge commit 'a926be0f4801b1e03f10605438f079e7a0605e72' into dependabot/bundler/font-awesome-sass-6.2.0
# Conflicts: # Gemfile.lock
This commit is contained in:
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
|
||||
|
||||
Reference in New Issue
Block a user