Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/prod-beta' into prod-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
dlabrecq committed Jul 13, 2023
2 parents ad0b22b + 6bd31da commit d8cd86a
Show file tree
Hide file tree
Showing 60 changed files with 2,569 additions and 16,479 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
directory: "/" # Location of package manifests
target-branch: "main"
schedule:
interval: "daily"
interval: "weekly"
open-pull-requests-limit: 10
labels:
- "dependency-bot"
Expand Down
18 changes: 12 additions & 6 deletions locales/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -1410,12 +1410,6 @@
"value": "Should not exceed 10 decimals"
}
],
"costModelsReadOnly": [
{
"type": 0,
"value": "You have read only permissions"
}
],
"costModelsRefreshDialog": [
{
"type": 0,
Expand Down Expand Up @@ -10291,6 +10285,12 @@
"value": "Settings in Cost Management"
}
],
"notificationsAlertTitle": [
{
"type": 0,
"value": "Duration based notifications"
}
],
"oci": [
{
"type": 0,
Expand Down Expand Up @@ -11230,6 +11230,12 @@
"value": "Failed to get RBAC information"
}
],
"readOnlyPermissions": [
{
"type": 0,
"value": "You have read only permissions"
}
],
"recommended": [
{
"type": 0,
Expand Down
3 changes: 2 additions & 1 deletion locales/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"costModelsPopoverAriaLabel": "Cost model info popover",
"costModelsPopoverButtonAriaLabel": "Opens a dialog with cost model info",
"costModelsRateTooLong": "Should not exceed 10 decimals",
"costModelsReadOnly": "You have read only permissions",
"costModelsRefreshDialog": "Refresh this dialog",
"costModelsRemoveTagLabel": "Remove tag value",
"costModelsRequiredField": "This field is required",
Expand Down Expand Up @@ -397,6 +396,7 @@
"notAuthorizedStateOptimizations": "Optimizations in Cost Management",
"notAuthorizedStateRhel": "RHEL in Cost Management",
"notAuthorizedStateSettings": "Settings in Cost Management",
"notificationsAlertTitle": "Duration based notifications",
"oci": "Oracle Cloud Infrastructure",
"ociComputeTitle": "Virtual machines usage",
"ociCostTrendTitle": "Oracle Cloud Infrastructure cumulative cost comparison ({units})",
Expand Down Expand Up @@ -484,6 +484,7 @@
"rawCostTitle": "Raw cost",
"rbacErrorDesc": "There was a problem receiving user permissions. Refreshing this page may fix it. If it does not, please contact your admin.",
"rbacErrorTitle": "Failed to get RBAC information",
"readOnlyPermissions": "You have read only permissions",
"recommended": "Recommended",
"redHatStatusUrl": "https://status.redhat.com",
"remove": "Remove",
Expand Down

0 comments on commit d8cd86a

Please sign in to comment.