Add latest changes from gitlab-org/gitlab@master

4 files changed, 11 insertions, 8 deletions

diff --git a/config/feature_flags/experiment/new_project_sast_enabled.yml b/config/feature_flags/development/jobs_table_vue_search.yml
index f47c01d26aa..ad0c25eccce 100644
--- a/config/feature_flags/experiment/new_project_sast_enabled.yml
+++ b/config/feature_flags/development/jobs_table_vue_search.yml
@@ -1,8 +1,8 @@
 ---
-name: new_project_sast_enabled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70548
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340929
-milestone: '14.4'
-type: experiment
-group: group::adoption
+name: jobs_table_vue_search
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82539
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356007
+milestone: '14.10'
+type: development
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 350363d79ce..016cbb23d49 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
-description: Unique visitors to /admin/dev_ops_report by month
+description: Unique visitors to /admin/dev_ops_reports by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 6b786fc82b3..d066dd2fb35 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -105,7 +105,8 @@ namespace :admin do
   resources :projects, only: [:index]
 
   resources :usage_trends, only: :index
-  resource :dev_ops_report, controller: 'dev_ops_report', only: :show
+  resource :dev_ops_reports, controller: 'dev_ops_report', only: :show
+  get 'dev_ops_report', to: redirect('admin/dev_ops_reports')
   resources :cohorts, only: :index
 
   scope(path: 'projects/*namespace_id',
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 9c76c4435ff..228c5776197 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -10,6 +10,8 @@ Devise.omniauth_providers.map(&:downcase).each do |provider|
 end
 
 namespace :import do
+  resources :history, only: [:index], controller: :history
+
   resources :available_namespaces, only: [:index], controller: :available_namespaces
 
   namespace :url do