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

Upgrade rails to 6.1 and migrate nodejs to mini_racer #2093

Merged
merged 51 commits into from
Aug 11, 2021

Conversation

saghoshprogress
Copy link
Contributor

@saghoshprogress saghoshprogress commented Aug 2, 2021

Description

Omnibus Fix for Rails 6

Issues Resolved

[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussions that are relevant]

Check List

@tas50 tas50 changed the title omnibus fix fir rails 6 (WIP) Upgrade rails to 6.1 and migrate nodejs to mini_racer Aug 3, 2021
@tas50 tas50 added the Aspect: Security Can an unwanted third party affect the stability or look at privileged information? label Aug 3, 2021
@@ -24,7 +24,7 @@
dependency "chef-gem"
dependency "git"
dependency "nginx"
dependency "nodejs"
# dependency "nodejs"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# dependency "nodejs"

@tas50
Copy link
Contributor

tas50 commented Aug 3, 2021

@saghoshprogress can you rebase this off master. There's been a lot of changes there and there's a bunch of conflicts

saghoshprogress and others added 9 commits August 3, 2021 20:50
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: Tim Smith <tsmith@chef.io>
Signed-off-by: Tim Smith <tsmith@chef.io>
@saghoshprogress
Copy link
Contributor Author

@saghoshprogress can you rebase this off master. There's been a lot of changes there and there's a bunch of conflicts

sure .. i will do the same

Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
@saghoshprogress saghoshprogress requested review from a team as code owners August 11, 2021 05:26
omnibus/Gemfile Outdated Show resolved Hide resolved
@@ -24,8 +24,7 @@
dependency "chef-gem"
dependency "git"
dependency "nginx"
# dependency "nodejs"
# dependency "nodejs-binary"
dependency "nodejs-binary"
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this still?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

everything I have removed.

saghoshprogress and others added 5 commits August 11, 2021 11:12
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
Signed-off-by: saghoshprogress <saghosh@progress.com>
@tas50 tas50 added the Expeditor: Bump Version Minor Used by github.minor_bump_labels to bump the Minor version number. label Aug 11, 2021
Signed-off-by: Tim Smith <tsmith@chef.io>
omnibus/config/software/supermarket.rb Outdated Show resolved Hide resolved
omnibus/config/software/supermarket.rb Outdated Show resolved Hide resolved
Signed-off-by: Tim Smith <tsmith@chef.io>
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50 tas50 merged commit d1cacd6 into master Aug 11, 2021
@tas50 tas50 deleted the saghoshprogress/rails_6_omnibus_fix branch August 11, 2021 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Aspect: Security Can an unwanted third party affect the stability or look at privileged information? Expeditor: Bump Version Minor Used by github.minor_bump_labels to bump the Minor version number.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants