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

ライブラリの更新 (202101) #196

Merged
merged 2 commits into from
Jan 11, 2021
Merged

Conversation

koi-chan
Copy link
Member

ruby-gems を 2021-01-10 現在の最新に更新しました。

nokogiri のバグ GHSA-vr8q-g5c7-m54m への対応を含みます。

@koi-chan koi-chan self-assigned this Jan 10, 2021
@koi-chan koi-chan changed the title library-verUP-202101: bundle update ライブラリの更新 (202101) Jan 10, 2021
Copy link
Member

@ochaochaocha3 ochaochaocha3 left a comment

Choose a reason for hiding this comment

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

手元でmasterをマージしようとしたところ、衝突でGemfile.lockがぐちゃぐちゃになってしまうようです。一度Gemfile.lockを削除した後 bundle install した状態でforce-pushしていただけないでしょうか?

@koi-chan
Copy link
Member Author

force-push, merge master をしました。

Copy link
Member

@ochaochaocha3 ochaochaocha3 left a comment

Choose a reason for hiding this comment

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

ありがとうございます!

@ochaochaocha3 ochaochaocha3 merged commit 97c29c9 into master Jan 11, 2021
@ochaochaocha3 ochaochaocha3 deleted the library-verUP-202101 branch January 11, 2021 13:17
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