Skip to content

Update generated bin/dev to be the same as cssbundling-rails #95

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
Merged
merged 1 commit into from
Feb 25, 2022
Merged

Update generated bin/dev to be the same as cssbundling-rails #95

merged 1 commit into from
Feb 25, 2022

Conversation

@dorianmariecom
Copy link
Contributor

@dorianmariecom dorianmariecom commented Feb 25, 2022 •
edited
Loading 

 conflict bin/dev Overwrite /Users/dorianmariefr/src/pipelines/bin/dev? (enter "h" for help) [Ynaqdhm] d --- /Users/dorianmariefr/src/pipelines/bin/dev	2022-02-25 19:25:58.000000000 +0100 +++ /Users/dorianmariefr/src/pipelines/bin/dev20220225-32075-ytg5lb	2022-02-25 19:42:59.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if ! gem list --silent --installed foreman +if ! command -v foreman &> /dev/null then echo "Installing foreman..." gem install foreman Retrying... Overwrite /Users/dorianmariefr/src/pipelines/bin/dev? (enter "h" for help) [Ynaqdhm]
@dorianmariecom dorianmariecom mentioned this pull request Feb 25, 2022
Closed
@dorianmariecom
Copy link
Contributor Author

dorianmariecom commented Feb 25, 2022

See rails/cssbundling-rails#80 for a similar one I made on cssbundling-rails
@rafaelfranca rafaelfranca merged commit 44b94c6 into rails:main Feb 25, 2022
@dorianmariecom dorianmariecom deleted the patch-1 branch February 25, 2022 19:13
yahonda added a commit to yahonda/rails that referenced this pull request Mar 1, 2022
@yahonda
Bump jsbindling-rails and cssbundling-rails
c689263 
When both jsbundling-rails v1.0.1 and cssbundling-rails v1.1.0 are used at the same time, thor shows the prompt to replace `bin/dev` or not. jsbundling-rails v1.0.2 addresses this issue. https://github.com/rails/jsbundling-rails/releases/tag/v1.0.2 rails/jsbundling-rails#95
This was referenced Mar 1, 2022
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants

@dorianmariecom @rafaelfranca