conflict fixed

Signed-off-by: lukzerom <lukzerom@gmail.com>
2021-12-21 10:13:41 +01:00
parent 73a91e25f9 b975484fac
commit 2140643512
227 changed files with 3370 additions and 2148 deletions
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Add Optional Props to Override Icon for SidebarSearch and SidebarSearchModal Component
@@ -0,0 +1,22 @@
+---
+'@backstage/backend-common': patch
+---
+
+Fixed bug in backend-common to allow passing of remote option in order to enable passing remote url in --config option. The remote option should be passed along with reloadIntervalSeconds from packages/backend/src/index.ts (Updated the file as well)
+
+These changes are needed in `packages/backend/src/index.ts` if remote URLs are desired to be passed in --config option and read and watch remote files for config.
+
+```diff
+@@ -86,7 +86,11 @@ async function main() {
+   const config = await loadBackendConfig({
+     argv: process.argv,
+     logger,
+    remote: {
+      reloadIntervalSeconds: 60 * 10 // Check remote config changes every 10 minutes. Change to your desired interval in seconds
+    }
+   });
+
+   const createEnv = makeCreateEnv(config);
+
+   const healthcheckEnv = useHotMemoize(module, () => createEnv('healthcheck'));
+```
@@ -0,0 +1,5 @@
+---
+'@backstage/config-loader': patch
+---
+
+In case remote.reloadIntervalSeconds is passed, it must be a valid positive value
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+Fix undefined identity bug in UserSettingsProfileCard caused by using deprecated methods of the IdentityApi
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added peerPluginDependencies option to experimentalInstallationRecipe for install command to install plugins it depends on.
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-radar': minor
+---
+
+Add new property to enable open links in a new window/tab
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Fixed bug in OwnershipCard component where text wasn't correctly pluralized
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+---
+
+Add new options to rails new (force and skipTests)
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-common': minor
+---
+
+Create catalog-common and add catalog permissions.
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-bazaar': patch
+'@backstage/plugin-bazaar-backend': patch
+---
+
+made the linkage between a Bazaar project to a catalog Entity optional
@@ -0,0 +1,5 @@
+---
+'@backstage/config-loader': minor
+---
+
+Removed deprecated option `env` from `LoadConfigOptions` and associated tests
@@ -0,0 +1,5 @@
+---
+'@backstage/test-utils': minor
+---
+
+Removed deprecated `Keyboard` class which has been superseded by `@testing-library/user-event#userEvent`
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-rollbar-backend': patch
+---
+
+Bump `axios`
@@ -0,0 +1,7 @@
+---
+'@backstage/core-app-api': minor
+---
+
+- Removed deprecated definition `createApp` from `@backstage/core-app-api` which has been replaced by `@backstage/app-defaults#createApp`
+- Removed deprecated type `BackstagePluginWithAnyOutput`
+- Removed deprecated constructors for `GithubAuth`, `OAuth2`, and `SamlAuth` as the `create` method should be used instead
@@ -0,0 +1,8 @@
+---
+'@backstage/core-plugin-api': minor
+---
+
+- Removed deprecated option `description` from `ApiRefConfig`
+- Removed descriptions from all plugin API refs
+- Removed deprecated parameters `path`, `icon`, and `title` in `createRouteRef`
+- Removed deprecated types `Error` and `ErrorContext` from `ErrorApi`
@@ -0,0 +1,5 @@
+---
+'@backstage/test-utils': minor
+---
+
+Removed deprecated `msw` definition which was replaced by calling `setupRequestMockHandlers` directly
@@ -0,0 +1,5 @@
+---
+'@backstage/config-loader': minor
+---
+
+Removed deprecated option `configPaths` as it has been superseded by `configTargets`
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Fixed the fallback identity population to correctly generate an entity reference for `userEntityRef` if no token is provided.
@@ -0,0 +1,9 @@
+---
+'@backstage/app-defaults': patch
+'@backstage/core-app-api': minor
+'@backstage/core-plugin-api': minor
+---
+
+- Removed deprecation configuration option `theme` from `AppTheme` of the `AppThemeApi`
+- Removed reference to `theme` in the `app-defaults` default `AppTheme`
+- Removed logic in `AppThemeProvider` that creates `ThemeProvider` from `appTheme.theme`
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-search-backend': minor
+---
+
+Search result location filtering
+
+This change introduces a filter for search results based on their location protocol. The intention is to filter out unsafe or
+malicious values before they can be consumed by the frontend. By default locations must be http/https URLs (or paths).
@@ -0,0 +1,17 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-org': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-sonarqube': patch
+---
+
+Prefer using `Link` from `@backstage/core-components` rather than material-UI.
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-jenkins-backend': patch
+---
+
+feature: add crumbIssuer option to Jenkins (optional) configuration, improve the UI to show a notification after executing the action re-build
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-jenkins': patch
+---
+
+feature: add crumbIssuer option to Jenkins (optional) configuration, improve the UI to show a notification after executing the action re-build
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+Schema-validate local storage cached session info on load
@@ -0,0 +1,5 @@
+---
+'@backstage/core-plugin-api': minor
+---
+
+Removed deprecated types `ApiRefType` and `ApiRefsToTypes`