Add latest changes from gitlab-org/gitlab@master

6 files changed, 75 insertions, 3 deletions

diff --git a/config/feature_flags/development/ci_runners_short_circuit_assignable_for.yml b/config/feature_flags/development/ci_runners_short_circuit_assignable_for.yml
new file mode 100644
index 00000000000..5c54feb6cee
--- /dev/null
+++ b/config/feature_flags/development/ci_runners_short_circuit_assignable_for.yml
@@ -0,0 +1,8 @@
+---
+name: ci_runners_short_circuit_assignable_for
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55518
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323317 
+milestone: '13.10'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/pages_serve_from_migrated_zip.yml b/config/feature_flags/development/pages_serve_from_migrated_zip.yml
index 18b912215b6..2912beb3985 100644
--- a/config/feature_flags/development/pages_serve_from_migrated_zip.yml
+++ b/config/feature_flags/development/pages_serve_from_migrated_zip.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300021
 milestone: '13.9'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml b/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml
new file mode 100644
index 00000000000..64e46689775
--- /dev/null
+++ b/config/feature_flags/development/usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322166
+milestone: '13.10'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
new file mode 100644
index 00000000000..b67a8c521a9
--- /dev/null
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly
+description: Monthly unique user count having merge requests which contains the CI config file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
new file mode 100644
index 00000000000..6aa2fb0869b
--- /dev/null
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly
+description: Weekly unique user count having merge requests which contains the CI config file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/routes.rb b/config/routes.rb
index afd92faf5e4..38030a24cb5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -132,8 +132,24 @@ Rails.application.routes.draw do
     # UserCallouts
     resources :user_callouts, only: [:create]
 
-    get 'ide' => 'ide#index'
-    get 'ide/*vueroute' => 'ide#index', format: false
+    scope :ide, as: :ide, format: false do
+      get '/', to: 'ide#index'
+      get '/project', to: 'ide#index'
+
+      scope path: 'project/:project_id', as: :project, constraints: { project_id: Gitlab::PathRegex.full_namespace_route_regex } do
+        %w[edit tree blob].each do |action|
+          get "/#{action}", to: 'ide#index'
+          get "/#{action}/*branch/-/*path", to: 'ide#index'
+          get "/#{action}/*branch/-", to: 'ide#index'
+          get "/#{action}/*branch", to: 'ide#index'
+        end
+
+        get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ }
+        get '/', to: 'ide#index'
+      end
+    end
+
+    resource :projects
 
     draw :operations
     draw :jira_connect