diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies index 9478abaf8..04b4a0085 100644 --- a/Gemfile-rails-dependencies +++ b/Gemfile-rails-dependencies @@ -3,13 +3,9 @@ version_file = File.expand_path("../.rails-version", __FILE__) case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || '' when /master/ gem "rails", :git => "https://github.com/rails/rails.git" - gem "arel", :git => "https://github.com/rails/arel.git" - gem "journey", :git => "https://github.com/rails/journey.git" gem "activerecord-deprecated_finders", :git => "https://github.com/rails/activerecord-deprecated_finders.git" gem "web-console", :git => "https://github.com/rails/web-console", :group => :development gem 'coffee-rails', :git => "https://github.com/rails/coffee-rails.git" - gem 'rack', :git => 'https://github.com/rack/rack.git' - gem 'i18n', :git => 'https://github.com/svenfuchs/i18n.git', :branch => 'master' gem 'sprockets', :git => 'https://github.com/rails/sprockets.git', :branch => 'master' gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git', :branch => 'master' gem 'puma', "3.12.1" diff --git a/example_app_generator/generate_app.rb b/example_app_generator/generate_app.rb index 1cc56f5b6..08ecbf2f6 100644 --- a/example_app_generator/generate_app.rb +++ b/example_app_generator/generate_app.rb @@ -18,9 +18,10 @@ # Remove the existing rails version so we can properly use main or other # edge branches - gsub_file 'Gemfile', /^.*\bgem 'rails.*$/, '' + gsub_file 'Gemfile', /^.*\bgem ['"]rails.*$/, '' + gsub_file 'Gemfile', /^.*\bgem ['"]selenium\-webdriver.*$/, '' gsub_file "Gemfile", /.*web-console.*/, '' - gsub_file "Gemfile", /.*debugger.*/, '' + gsub_file "Gemfile", /.*debug.*/, '' gsub_file "Gemfile", /.*puma.*/, '' gsub_file "Gemfile", /.*bootsnap.*/, '' @@ -77,4 +78,11 @@ 'REPLACE_BUNDLE_PATH', bundle_install_path chmod 'ci_retry_bundle_install.sh', 0755 + + if Rails::VERSION::STRING > '7' + create_file 'app/assets/config/manifest.js' do + "//= link application.css" + end + create_file 'app/assets/stylesheets/application.css' + end end