Add latest changes from gitlab-org/gitlab@master

5 files changed, 71 insertions, 9 deletions

diff --git a/lib/gitlab/ci/config/normalizer/matrix_strategy.rb b/lib/gitlab/ci/config/normalizer/matrix_strategy.rb
index db21274a9ed..2865b2dcdb7 100644
--- a/lib/gitlab/ci/config/normalizer/matrix_strategy.rb
+++ b/lib/gitlab/ci/config/normalizer/matrix_strategy.rb
@@ -48,18 +48,29 @@ module Gitlab
             }
           end
 
-          def name_with_details
-            vars = variables.map { |key, value| "#{key}=#{value}"}.join('; ')
+          def name
+            if Gitlab::Ci::Features.new_matrix_job_names_enabled?
+              name_with_variable_details
+            else
+              old_name
+            end
+          end
+
+          private
 
-            "#{job_name} (#{vars})"
+          def name_with_variable_details
+            vars = variables
+              .values
+              .compact
+              .join(', ')
+
+            "#{job_name}: [#{vars}]"
           end
 
-          def name
+          def old_name
             "#{job_name} #{instance}/#{total}"
           end
 
-          private
-
           attr_reader :job_name, :instance, :variables, :total
         end
       end
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 386788c751f..da66cec935c 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -76,6 +76,10 @@ module Gitlab
         Feature.enabled?(:project_transactionless_destroy, project, default_enabled: false)
       end
 
+      def self.new_matrix_job_names_enabled?
+        ::Feature.enabled?(:ci_matrix_job_names, default_enabled: false)
+      end
+
       def self.coverage_report_view?(project)
         ::Feature.enabled?(:coverage_report_view, project)
       end
diff --git a/lib/gitlab/ci/status/composite.rb b/lib/gitlab/ci/status/composite.rb
index 04a9fc29802..9a4f5644f7d 100644
--- a/lib/gitlab/ci/status/composite.rb
+++ b/lib/gitlab/ci/status/composite.rb
@@ -7,7 +7,7 @@ module Gitlab
         include Gitlab::Utils::StrongMemoize
 
         # This class accepts an array of arrays/hashes/or objects
-        def initialize(all_statuses, with_allow_failure: true)
+        def initialize(all_statuses, with_allow_failure: true, dag: false)
           unless all_statuses.respond_to?(:pluck)
             raise ArgumentError, "all_statuses needs to respond to `.pluck`"
           end
@@ -15,6 +15,7 @@ module Gitlab
           @status_set = Set.new
           @status_key = 0
           @allow_failure_key = 1 if with_allow_failure
+          @dag = dag
 
           consume_all_statuses(all_statuses)
         end
@@ -31,7 +32,13 @@ module Gitlab
           return if none?
 
           strong_memoize(:status) do
-            if only_of?(:skipped, :ignored)
+            if @dag && any_of?(:skipped)
+              # The DAG job is skipped if one of the needs does not run at all.
+              'skipped'
+            elsif @dag && !only_of?(:success, :failed, :canceled, :skipped, :success_with_warnings)
+              # DAG is blocked from executing if a dependent is not "complete"
+              'pending'
+            elsif only_of?(:skipped, :ignored)
               'skipped'
             elsif only_of?(:success, :skipped, :success_with_warnings, :ignored)
               'success'
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 1ba21d99277..ffd5b9aee2f 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -38,6 +38,7 @@ module Gitlab
             .merge(usage_activity_by_stage(:usage_activity_by_stage_monthly, last_28_days_time_period))
             .merge(analytics_unique_visits_data)
             .merge(compliance_unique_visits_data)
+            .merge(search_unique_visits_data)
         end
       end
 
@@ -130,6 +131,7 @@ module Gitlab
             milestone_lists: count(List.milestone),
             milestones: count(Milestone),
             projects_with_packages: distinct_count(::Packages::Package, :project_id),
+            packages: count(::Packages::Package),
             pages_domains: count(PagesDomain),
             pool_repositories: count(PoolRepository),
             projects: count(Project),
@@ -511,7 +513,17 @@ module Gitlab
           events: distinct_count(::Event.where(time_period), :author_id),
           groups: distinct_count(::GroupMember.where(time_period), :user_id),
           users_created: count(::User.where(time_period), start: user_minimum_id, finish: user_maximum_id),
-          omniauth_providers: filtered_omniauth_provider_names.reject { |name| name == 'group_saml' }
+          omniauth_providers: filtered_omniauth_provider_names.reject { |name| name == 'group_saml' },
+          projects_imported: {
+            gitlab_project: projects_imported_count('gitlab_project', time_period),
+            gitlab: projects_imported_count('gitlab', time_period),
+            github: projects_imported_count('github', time_period),
+            bitbucket: projects_imported_count('bitbucket', time_period),
+            bitbucket_server: projects_imported_count('bitbucket_server', time_period),
+            gitea: projects_imported_count('gitea', time_period),
+            git: projects_imported_count('git', time_period),
+            manifest: projects_imported_count('manifest', time_period)
+          }
         }
       end
       # rubocop: enable CodeReuse/ActiveRecord
@@ -608,6 +620,18 @@ module Gitlab
         { compliance_unique_visits: results }
       end
 
+      def search_unique_visits_data
+        events = ::Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category('search')
+        results = events.each_with_object({}) do |event, hash|
+          hash[event] = redis_usage_data { ::Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: event, start_date: 7.days.ago.to_date, end_date: Date.current) }
+        end
+
+        results['search_unique_visits_for_any_target_weekly'] = redis_usage_data { ::Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: events, start_date: 7.days.ago.to_date, end_date: Date.current) }
+        results['search_unique_visits_for_any_target_monthly'] = redis_usage_data { ::Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: events, start_date: 4.weeks.ago.to_date, end_date: Date.current) }
+
+        { search_unique_visits: results }
+      end
+
       def action_monthly_active_users(time_period)
         counter = Gitlab::UsageDataCounters::TrackUniqueEvents
 
@@ -774,6 +798,10 @@ module Gitlab
       def deployment_count(relation)
         count relation, start: deployment_minimum_id, finish: deployment_maximum_id
       end
+
+      def projects_imported_count(from, time_period)
+        distinct_count(::Project.imported_from(from).where(time_period), :creator_id) # rubocop: disable CodeReuse/ActiveRecord
+      end
     end
   end
 end
diff --git a/lib/gitlab/usage_data_counters/known_events.yml b/lib/gitlab/usage_data_counters/known_events.yml
index feda3aeedfe..cd4d31345d7 100644
--- a/lib/gitlab/usage_data_counters/known_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events.yml
@@ -84,3 +84,15 @@
   redis_slot: edit
   expiry: 29
   aggregation: daily
+- name: i_search_total
+  category: search
+  redis_slot: search
+  aggregation: weekly
+- name: i_search_advanced
+  category: search
+  redis_slot: search
+  aggregation: weekly
+- name: i_search_paid
+  category: search
+  redis_slot: search
+  aggregation: weekly