Merge remote-tracking branch 'origin' into knguyen2/ent-9948

Author: Katrina Nguyen

catalog-info.yaml

@@ -32,12 +32,4 @@ spec:
   type: 'website'
 
   # (Required) Acceptable Lifecycle Values: experimental, production, deprecated
-  lifecycle: 'production'
-
-  # (Optional) The value can be the name of any known component.
-  subcomponentOf: '<name_of_a_component>'
-
-  # (Optional) An array of different components or resources.
-  dependsOn:
-  - '<component_or_resource>'
-  - '<another_component_or_resource>'
+  lifecycle: 'production'

openedx.yaml

@@ -1,16 +1,23 @@
 {
   "extends": [
-    "config:base"
+    "config:recommended",
+    "group:allNonMajor"
   ],
   "patch": {
     "automerge": true
   },
-  "rebaseStalePrs": true,
+  "rebaseWhen": "behind-base-branch",
   "packageRules": [
     {
-      "matchPackagePatterns": ["@edx", "@openedx"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ],
+      "automerge": true,
+      "matchPackageNames": [
+        "/@edx/",
+        "/@openedx/"
+      ]
     }
   ]
 }