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.

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

feat: upgrade Ruby #1505

Merged
merged 3 commits into from
Jan 11, 2022
Merged

feat: upgrade Ruby #1505

merged 3 commits into from
Jan 11, 2022

Conversation

btrd
Copy link
Contributor

@btrd btrd commented Jan 10, 2022

No description provided.

Jean Bertrand added 3 commits January 10, 2022 10:45

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@btrd btrd requested a review from ksol January 10, 2022 14:02
Copy link
Contributor

@ksol ksol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the rename of files?

@btrd
Copy link
Contributor Author

btrd commented Jan 11, 2022

To fix these warnings when running bundle exec jekyll serve --watch --trace --incremental --livereload --livereload-port 4302

          Conflict: The following destination is shared by multiple files.
                    The written file may end up with unexpected contents.
                    /Users/jean_scalingo/Repositories/scalingo/documentation/_site/changelog/security/renew-ssl-certs.html
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/security/_posts/2015-04-17-renew-ssl-certs.markdown
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/security/_posts/2016-01-09-renew-ssl-certs.markdown

          Conflict: The following destination is shared by multiple files.
                    The written file may end up with unexpected contents.
                    /Users/jean_scalingo/Repositories/scalingo/documentation/_site/changelog/buildpacks/ruby-updates-multiple-cves.html
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/buildpacks/_posts/2018-03-29-ruby-updates-multiple-cves.md
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/buildpacks/_posts/2018-10-22-ruby-updates-multiple-cves.md

          Conflict: The following destination is shared by multiple files.
                    The written file may end up with unexpected contents.
                    /Users/jean_scalingo/Repositories/scalingo/documentation/_site/changelog/databases/redis-4-0-14.html
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/databases/_posts/2019-04-12-redis-4.0.14.markdown
                     - /Users/jean_scalingo/Repositories/scalingo/documentation/changelog/databases/_posts/2019-05-16-redis-4.0.14.markdown

@btrd btrd merged commit 58d90c4 into master Jan 11, 2022
@btrd btrd deleted the upgrade branch January 11, 2022 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants