Start running Rails from the main branch #16

Merged
atomaka merged 13 commits from rails-main into main 2024-06-21 23:35:37 -04:00
3 changed files with 7 additions and 15 deletions
Showing only changes of commit 67be7f597c - Show all commits

View file

@ -1,9 +1,8 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", github: "rails/rails", branch: "main" gem "rails", github: "rails/rails", branch: "main"
gem "sprockets-rails"
# The modern asset pipeline for Rails [https://github.com/rails/propshaft] # The modern asset pipeline for Rails [https://github.com/rails/propshaft]
# gem "propshaft" gem "propshaft"
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem "sqlite3", ">= 1.4" gem "sqlite3", ">= 1.4"
# Use the Puma web server [https://github.com/puma/puma] # Use the Puma web server [https://github.com/puma/puma]

View file

@ -178,6 +178,11 @@ GEM
parser (3.3.3.0) parser (3.3.3.0)
ast (~> 2.4.1) ast (~> 2.4.1)
racc racc
propshaft (0.9.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.1.2) psych (5.1.2)
stringio stringio
public_suffix (6.0.0) public_suffix (6.0.0)
@ -245,13 +250,6 @@ GEM
rexml (~> 3.2, >= 3.2.5) rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0) rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0) websocket (~> 1.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (2.0.2-aarch64-linux-gnu) sqlite3 (2.0.2-aarch64-linux-gnu)
sqlite3 (2.0.2-arm64-darwin) sqlite3 (2.0.2-arm64-darwin)
sqlite3 (2.0.2-x86_64-linux-gnu) sqlite3 (2.0.2-x86_64-linux-gnu)
@ -301,11 +299,11 @@ DEPENDENCIES
debug debug
importmap-rails importmap-rails
jbuilder jbuilder
propshaft
puma (>= 5.0) puma (>= 5.0)
rails! rails!
rubocop-rails-omakase rubocop-rails-omakase
selenium-webdriver selenium-webdriver
sprockets-rails
sqlite3 (>= 1.4) sqlite3 (>= 1.4)
stimulus-rails stimulus-rails
tailwindcss-rails (~> 2.0) tailwindcss-rails (~> 2.0)

View file

@ -1,5 +0,0 @@
//= link_tree ../images
//= link_directory ../stylesheets .css
//= link_tree ../../javascript .js
//= link_tree ../../../vendor/javascript .js
//= link_tree ../builds