Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix minor sandbox generation issues #5618

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Fix minor sandbox generation issues #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4f14e8
Append to .gitignore only when file exists
spaghetticode Jan 23, 2024
17647e5
Run `bundle add solidus_admin` only when missing
spaghetticode Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion admin/lib/solidus_admin/install_tailwindcss.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
end
RUBY

append_file ".gitignore", "app/assets/builds/solidus_admin/"
if Rails.root.join(".gitignore").exist?
append_file ".gitignore", "app/assets/builds/solidus_admin/"
end

unless Rails.root.join("Procfile.dev").exist?
create_file "Procfile.dev", <<~YAML
Expand Down
4 changes: 3 additions & 1 deletion core/lib/generators/solidus/install/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ def install_solidus_admin
return unless options[:admin_preview]

say_status :installing, "SolidusAdmin", :blue
bundle_command 'add solidus_admin -v ">= 0.2"'
unless File.read(app_path.join('Gemfile')).include?('solidus_admin')
bundle_command 'add solidus_admin -v ">= 0.2"'
end
generate 'solidus_admin:install'
end

Expand Down
Loading