Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 7 deletions

diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index 5f410c487e9..391cd6dd15e 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -235,9 +235,6 @@ export default {
         this.externalDashboardUrl.length
       );
     },
-    shouldRenderSearchableEnvironmentsDropdown() {
-      return this.glFeatures.searchableEnvironmentsDropdown;
-    },
     shouldShowEnvironmentsDropdownNoMatchedMsg() {
       return !this.environmentsLoading && this.filteredEnvironments.length === 0;
     },
@@ -405,7 +402,6 @@ export default {
               }}</gl-dropdown-header>
               <gl-dropdown-divider />
               <gl-search-box-by-type
-                v-if="shouldRenderSearchableEnvironmentsDropdown"
                 ref="monitorEnvironmentsDropdownSearch"
                 class="m-2"
                 @input="debouncedEnvironmentsSearch"
@@ -426,7 +422,6 @@ export default {
                 >
               </div>
               <div
-                v-if="shouldRenderSearchableEnvironmentsDropdown"
                 v-show="shouldShowEnvironmentsDropdownNoMatchedMsg"
                 ref="monitorEnvironmentsDropdownMsg"
                 class="text-secondary no-matches-message"
diff --git a/app/assets/javascripts/monitoring/stores/getters.js b/app/assets/javascripts/monitoring/stores/getters.js
index ed1e3e3ffec..3801149e49d 100644
--- a/app/assets/javascripts/monitoring/stores/getters.js
+++ b/app/assets/javascripts/monitoring/stores/getters.js
@@ -62,8 +62,6 @@ export const metricsWithData = state => groupKey => {
  * Filter environments by names.
  *
  * This is used in the environments dropdown with searchable input.
- * Also, this searchable dropdown is behind `searchable_environments_dropdown`
- * feature flag
  *
  * @param {Object} state
  * @returns {Array} List of environments