Merge remote-tracking branch 'origin/master' into radjabov

ManageIQ · May 22, 2024 · 35914a3 · 35914a3
2 parents b9ead79 + f6b437a
commit 35914a3
Show file tree

Hide file tree

Showing 6 changed files with 1,128 additions and 1,127 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -31,7 +31,7 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3
 exclude_patterns:
 - node_modules/
 - spec/

diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarn/releases/yarn-4.2.2.cjs b/.yarn/releases/yarn-4.2.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -4,4 +4,4 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.2.2.cjs
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "node": ">= 18.0.0",
     "npm": ">= 8.6.0"
   },
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.2.2",
   "resolutions": {
     "es-abstract": "~1.21.3"
   }

diff --git a/yarn.lock b/yarn.lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ enableGlobalCache: true

		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-4.0.2.cjs
		yarnPath: .yarn/releases/yarn-4.2.2.cjs