From 398bc045fc0094d9a1482f040d7ef334c6a8034b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 7 Aug 2020 10:35:30 +0200
Subject: [PATCH] Orgs: Remove org deprecation notice as we have decided to
 preserve multi-org support  (#26853)

* Orgs: Remove org deprecation notice

* Updated
---
 public/app/features/admin/AdminListOrgsPage.tsx | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/public/app/features/admin/AdminListOrgsPage.tsx b/public/app/features/admin/AdminListOrgsPage.tsx
index 43b4c290efc..92c8d677d93 100644
--- a/public/app/features/admin/AdminListOrgsPage.tsx
+++ b/public/app/features/admin/AdminListOrgsPage.tsx
@@ -3,7 +3,7 @@ import { getNavModel } from 'app/core/selectors/navModel';
 import Page from 'app/core/components/Page/Page';
 import { useSelector } from 'react-redux';
 import { StoreState } from 'app/types/store';
-import { LinkButton, InfoBox, VerticalGroup } from '@grafana/ui';
+import { LinkButton } from '@grafana/ui';
 import { getBackendSrv } from '@grafana/runtime';
 import { AdminOrgsTable } from './AdminOrgsTable';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
@@ -30,21 +30,6 @@ export const AdminListOrgsPages: FC = () => {
       <Page.Contents>
         <>
           <div className="page-action-bar">
-            <InfoBox branded>
-              <VerticalGroup spacing="xs">
-                <p>
-                  Fewer than 1% of Grafana installations use organizations, and we think that most of those would have a
-                  better experience with Teams instead. As such, we are considering de-emphasizing and eventually
-                  deprecating Organizations in a future Grafana release. If you would like to provide feedback or
-                  describe your need, please do so{' '}
-                  <a className="external-link" href="https://github.com/grafana/grafana/issues/24588">
-                    here
-                  </a>
-                  .{' '}
-                </p>
-              </VerticalGroup>
-            </InfoBox>
-
             <div className="page-action-bar__spacer" />
             <LinkButton icon="plus" href="org/new">
               New org