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

Rails61 redo #665

Merged
merged 4 commits into from
Jun 21, 2021
Merged

Rails61 redo #665

merged 4 commits into from
Jun 21, 2021

Conversation

jgreben
Copy link
Contributor

@jgreben jgreben commented Jun 18, 2021

There were conflicts in the Gemfile.lock and deploy problems with the previous rails61 PR. I checked out a new branch from the updated main branch and checked out/added the changed filed from the original rails61 PR.

@jgreben
Copy link
Contributor Author

jgreben commented Jun 18, 2021

@cbeer, your original PR looked fine, but I had some trouble resolving conflicts as noted. I'd like to punt back to you to do the merge if that's OK.

@jgreben jgreben requested a review from cbeer June 18, 2021 16:29
@jgreben jgreben marked this pull request as draft June 18, 2021 16:32
@jgreben jgreben removed the request for review from cbeer June 18, 2021 16:32
@jgreben jgreben marked this pull request as ready for review June 21, 2021 21:27
@jgreben
Copy link
Contributor Author

jgreben commented Jun 21, 2021

@cbeer This is ready for review. If you want to check out a new branch and re-submit it for my review, that's OK with me. I had to request that node be upgraded on -dev in order for to install all the node_modules, so before deploying this tp uat or prod, we will have to check that off as well.

@jgreben jgreben requested a review from cbeer June 21, 2021 21:30
@cbeer cbeer merged commit f6be556 into main Jun 21, 2021
@cbeer cbeer deleted the rails61-redo branch June 21, 2021 22:05
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.

2 participants