Add latest changes from gitlab-org/gitlab@master

5 files changed, 7 insertions, 12 deletions

diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml
index be4fa19019f..8aaa09b7862 100644
--- a/app/views/ci/variables/_index.html.haml
+++ b/app/views/ci/variables/_index.html.haml
@@ -17,6 +17,7 @@
   is_group: is_group.to_s,
   group_id: @group&.id || '',
   group_path: @group&.full_path,
+  maskable_raw_regex: ci_variable_maskable_raw_regex,
   maskable_regex: ci_variable_maskable_regex,
   protected_by_default: ci_variable_protected_by_default?.to_s,
   aws_logo_svg_path: image_path('aws_logo.svg'),
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 97fb35b28ab..677e2bd6007 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -10,7 +10,7 @@
 
   - if current_user
     .page-title-controls.ml-0.mb-3.ml-sm-auto.mb-sm-0
-      = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _("merge request"), with_feature_enabled: 'merge_requests', type: :merge_requests
+      = render 'shared/new_project_item_vue_select'
 
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index bc8e3e6ab69..2556791da12 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -8,9 +8,7 @@
 
   - if current_user
     .page-title-controls
-      = render 'shared/new_project_item_select',
-        path: '-/milestones/new', label: _('Milestone'),
-        include_groups: true, type: :milestones
+      = render 'shared/new_project_item_vue_select'
 
 - if @milestone_states.any? { |name, count| count > 0 }
   .top-area
@@ -22,9 +20,7 @@
     = render 'shared/empty_states/milestones_tab', active_tab: params[:state] do
       - if current_user
         .page-title-controls
-          = render 'shared/new_project_item_select',
-            path: '-/milestones/new', label: _('Milestone'),
-            include_groups: true, type: :milestones
+          = render 'shared/new_project_item_vue_select'
   - else
     .milestones
       %ul.content-list
@@ -35,6 +31,4 @@
   = render 'shared/empty_states/milestones' do
     - if current_user
       .page-title-controls
-        = render 'shared/new_project_item_select',
-          path: '-/milestones/new', label: _('Milestone'),
-          include_groups: true, type: :milestones
+        = render 'shared/new_project_item_vue_select'
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 92f6c896e7b..f2d0cfc42fd 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -10,7 +10,7 @@
       - if @can_bulk_update
         = render_if_exists 'projects/merge_requests/bulk_update_button'
 
-      = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _("merge request"), type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true
+      = render 'shared/new_project_item_vue_select'
 
 = render 'shared/issuable/search_bar', type: :merge_requests
 - if @can_bulk_update
diff --git a/app/views/shared/_new_project_item_vue_select.html.haml b/app/views/shared/_new_project_item_vue_select.html.haml
index 24d275c4975..9ea99df106e 100644
--- a/app/views/shared/_new_project_item_vue_select.html.haml
+++ b/app/views/shared/_new_project_item_vue_select.html.haml
@@ -1,2 +1,2 @@
 - if any_projects?(@projects)
-  .js-new-resource-dropdown
+  .js-new-resource-dropdown{ data: { group_id: @group&.id, full_path: @group&.full_path, username: @current_user&.username } }