Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 1 deletions

diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index 50155668dca..0175647e71e 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -3,6 +3,8 @@
 require './spec/support/sidekiq_middleware'
 require './spec/support/helpers/test_env'
 require 'active_support/testing/time_helpers'
+require './spec/support/helpers/cycle_analytics_helpers.rb'
+require './ee/db/seeds/shared/dora_metrics.rb' if Gitlab.ee?
 
 # Usage:
 #
@@ -21,6 +23,7 @@ require 'active_support/testing/time_helpers'
 # rubocop:disable Rails/Output
 class Gitlab::Seeder::CycleAnalytics # rubocop:disable Style/ClassAndModuleChildren
   include ActiveSupport::Testing::TimeHelpers
+  include CycleAnalyticsHelpers
 
   attr_reader :project, :issues, :merge_requests, :developers
 
@@ -78,12 +81,30 @@ class Gitlab::Seeder::CycleAnalytics # rubocop:disable Style/ClassAndModuleChild
     seed_review_stage!
     seed_staging_stage!
 
+    if Gitlab.ee?
+      seed_dora_metrics!
+      create_custom_value_stream!
+      create_value_stream_aggregation(project.group)
+    end
+
     puts "Successfully seeded '#{project.full_path}' for Value Stream Management!"
     puts "URL: #{Rails.application.routes.url_helpers.project_url(project)}"
   end
 
   private
 
+  def create_custom_value_stream!
+    Analytics::CycleAnalytics::ValueStreams::CreateService.new(
+      current_user: admin,
+      namespace: project.group,
+      params: { name: "vs #{suffix}", stages: Gitlab::Analytics::CycleAnalytics::DefaultStages.all }
+    ).execute
+  end
+
+  def seed_dora_metrics!
+    Gitlab::Seeder::DoraMetrics.new(project: project).execute
+  end
+
   def seed_issue_stage!
     issues.each do |issue|
       time = within_end_time(issue.created_at + rand(MAX_DURATIONS[:issue]).hours)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c021dc5dd46..91a5ecff377 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -51325,7 +51325,7 @@ msgstr ""
 msgid "Workspaces|Workspaces"
 msgstr ""
 
-msgid "Workspaces|You can create a workspace for public Premium projects only."
+msgid "Workspaces|You can create a workspace for public projects only."
 msgstr ""
 
 msgid "Workspaces|You can't create a workspace for this project"