Add latest changes from gitlab-org/gitlab@master

app/helpers/analytics_navbar_helper.rb

@@ -31,7 +31,7 @@ module AnalyticsNavbarHelper
   end
   def cycle_analytics_navbar_link(project, current_user)
-    return unless Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, project)
+    return unless Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, project, default_enabled: true)
     return unless project_nav_tab?(:cycle_analytics)
     navbar_sub_item(
@@ -43,7 +43,7 @@ module AnalyticsNavbarHelper
   end
   def repository_analytics_navbar_link(project, current_user)
-    return if Feature.disabled?(:analytics_pages_under_project_analytics_sidebar, project)
+    return if Feature.disabled?(:analytics_pages_under_project_analytics_sidebar, project, default_enabled: true)
     return if project.empty_repo?
     navbar_sub_item(
@@ -55,7 +55,7 @@ module AnalyticsNavbarHelper
   end
   def ci_cd_analytics_navbar_link(project, current_user)
-    return unless Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, project)
+    return unless Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, project, default_enabled: true)
     return unless project_nav_tab?(:pipelines)
     return unless project.feature_available?(:builds, current_user) || !project.empty_repo?

app/services/ci/process_build_service.rb

@@ -3,7 +3,7 @@
 module Ci
   class ProcessBuildService < BaseService
     def execute(build, current_status)
-      if valid_statuses_for_when(build.when).include?(current_status)
+      if valid_statuses_for_build(build).include?(current_status)
         if build.schedulable?
           build.schedule
         elsif build.action?
@@ -25,10 +25,10 @@ module Ci
       build.enqueue
     end
-    def valid_statuses_for_when(value)
-      case value
+    def valid_statuses_for_build(build)
+      case build.when
       when 'on_success'
-        %w[success skipped]
+        build.scheduling_type_dag? ? %w[success] : %w[success skipped]
       when 'on_failure'
         %w[failed]
       when 'always'

app/views/layouts/nav/sidebar/_analytics_links.html.haml

@@ -6,10 +6,10 @@
     = link_to navbar_links.first.link do
       .nav-icon-container
         = sprite_icon('chart')
-      %span.nav-item-name
+      %span.nav-item-name{ data: { qa_selector: 'analytics_link' } }
         = _('Analytics')
-    %ul.sidebar-sub-level-items
+    %ul.sidebar-sub-level-items{ data: { qa_selector: 'analytics_sidebar_submenu' } }
       - navbar_links.each do |menu_item|
         = nav_link(path: menu_item.path) do
           = link_to(menu_item.link, menu_item.link_to_options) do

app/views/layouts/nav/sidebar/_group.html.haml

-- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_group_analytics_sidebar, @group)
+- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_group_analytics_sidebar, @group, default_enabled: true)
 - issues_count = group_issues_count(state: 'opened')
 - merge_requests_count = group_merge_requests_count(state: 'opened')

app/views/layouts/nav/sidebar/_project.html.haml

-- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, @project)
+- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, @project, default_enabled: true)
 .nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
   .nav-sidebar-inner-scroll
@@ -9,7 +9,7 @@
           = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile', width: 40, height: 40)
         .sidebar-context-title
           = @project.name
-    %ul.sidebar-top-level-items
+    %ul.sidebar-top-level-items.qa-project-sidebar
       - paths = sidebar_projects_paths
       - paths << 'cycle_analytics#show' unless should_display_analytics_pages_in_sidebar
       = nav_link(path: paths, html_options: { class: 'home' }) do

changelogs/unreleased/31526-skip-if-needed-job-skipped.yml

+---
+title: Prevent DAG builds to run after skipped need build
+merge_request: 23405
+author:
+type: fixed

changelogs/unreleased/55487-backfill-lfs-objects-projects-sql.yml

+---
+title: Backfill LfsObjectsProject records of forks
+merge_request: 24767
+author:
+type: other

changelogs/unreleased/georgekoltsov-object_builder_convert_empty_strings.yml

+---
+title: Fix Group Import existing objects lookup when description attribute is an empty
+  string
+merge_request: 25187
+author:
+type: fixed

changelogs/unreleased/jcunha-update-managed-apps-template.yml

+---
+title: Update cluster-applications to v0.8.0
+merge_request: 25138
+author:
+type: changed

changelogs/unreleased/toggle-analytics-navbar-feature-flags.yml

+---
+title: Move analytics pages under the sidebar for projects and groups
+merge_request: 24470
+author:
+type: changed

db/post_migrate/20200210062432_schedule_link_lfs_objects.rb

+# frozen_string_literal: true
+
+class ScheduleLinkLfsObjects < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  MIGRATION = 'LinkLfsObjects'
+  BATCH_SIZE = 1_000
+
+  disable_ddl_transaction!
+
+  class Project < ActiveRecord::Base
+    include EachBatch
+
+    self.table_name = 'projects'
+  end
+
+  def up
+    fork_network_members =
+      Gitlab::BackgroundMigration::LinkLfsObjects::ForkNetworkMember
+        .select(1)
+        .with_non_existing_lfs_objects
+        .where('fork_network_members.project_id = projects.id')
+
+    forks = Project.where('EXISTS (?)', fork_network_members)
+
+    queue_background_migration_jobs_by_range_at_intervals(
+      forks,
+      MIGRATION,
+      BackgroundMigrationWorker.minimum_interval,
+      batch_size: BATCH_SIZE
+    )
+  end
+
+  def down
+    # no-op
+  end
+end

doc/user/group/contribution_analytics/index.md

@@ -16,7 +16,7 @@ group:
 - Merge requests
 - Push events
-To view the Contribution Analytics, go to your group's **Overview > Contribution Analytics**
+To view the Contribution Analytics, go to your group's **Analytics > Contribution Analytics**
 page.
 ## Use cases

doc/user/group/insights/index.md

@@ -14,10 +14,10 @@ requests to be merged and much more.
 ## View your group's Insights
-You can access your group's Insights by clicking the **Overview > Insights**
+You can access your group's Insights by clicking the **Analytics > Insights**
 link in the left sidebar:
-![Insights sidebar link](img/insights_sidebar_link.png)
+![Insights sidebar link](img/insights_sidebar_link_v12_8.png)
 ## Configure your Insights

doc/user/group/issues_analytics/index.md

@@ -10,7 +10,7 @@ Issues Analytics is a bar graph which illustrates the number of issues created e
 The default timespan is 13 months, which includes the current month, and the 12 months
 prior.
-To access the chart, navigate to a group's sidebar and select **Issues > Analytics**.
+To access the chart, navigate to a group's sidebar and select **Analytics > Issues Analytics**.
 Hover over each bar to see the total number of issues.
@@ -28,7 +28,7 @@ You can change the total number of months displayed by setting a URL parameter.
 For example, `https://gitlab.com/groups/gitlab-org/-/issues_analytics?months_back=15`
 shows a total of 15 months for the chart in the GitLab.org group.
-![Issues created per month](img/issues_created_per_month.png)
+![Issues created per month](img/issues_created_per_month_v12_8.png)
 <!-- ## Troubleshooting