Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 45 deletions

diff --git a/doc/development/fe_guide/components.md b/doc/development/fe_guide/components.md
index 1c5ddd5e2a5..6b6274a6480 100644
--- a/doc/development/fe_guide/components.md
+++ b/doc/development/fe_guide/components.md
@@ -1,40 +1,3 @@
-# Components
-
-## Contents
-
-- [Dropdowns](#dropdowns)
-
-## Dropdowns
-
-See also the [corresponding UX guide](https://design.gitlab.com/#/components/dropdowns).
-
-### How to style a Bootstrap dropdown
-
-1. Use the HTML structure provided by the [docs][bootstrap-dropdowns]
-1. Add a specific class to the top level `.dropdown` element
-
-   ```Haml
-   .dropdown.my-dropdown
-     %button{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false }
-       %span.dropdown-toggle-text
-         Toggle Dropdown
-       = icon('chevron-down')
-
-     %ul.dropdown-menu
-       %li
-         %a
-           item!
-   ```
-
-   Or use the helpers
-
-   ```Haml
-   .dropdown.my-dropdown
-     = dropdown_toggle('Toogle!', { toggle: 'dropdown' })
-     = dropdown_content
-       %li
-         %a
-           item!
-   ```
-
-[bootstrap-dropdowns]: https://getbootstrap.com/docs/3.3/javascript/#dropdowns
+---
+redirect_to: 'https://design.gitlab.com/components/status/'
+---
diff --git a/doc/development/fe_guide/dropdowns.md b/doc/development/fe_guide/dropdowns.md
index e9d6244355c..019bd36573d 100644
--- a/doc/development/fe_guide/dropdowns.md
+++ b/doc/development/fe_guide/dropdowns.md
@@ -1 +1,3 @@
-This page has moved [here](components.md#dropdowns).
+---
+redirect_to: 'https://design.gitlab.com/components/dropdowns/'
+---
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md
index 9151fb0af9a..1cf798cedb6 100644
--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -41,6 +41,11 @@ or make changes to our frontend development guidelines.
 How we write frontend tests, run the GitLab test suite, and debug test related
 issues.
 
+## Pajamas Design System
+
+Reusable components with technical and usage guidelines can be found in our
+[Pajamas Design System](https://design.gitlab.com/).
+
 ## [Design Patterns](design_patterns.md)
 
 Common JavaScript design patterns in GitLab's codebase.
@@ -65,10 +70,6 @@ How to use GraphQL
 
 How we use SVG for our Icons and Illustrations.
 
-## [Components](components.md)
-
-How we use UI components.
-
 ## Frontend FAQ
 
 Read the [frontend's FAQ](frontend_faq.md) for common small pieces of helpful information.