Add latest changes from gitlab-org/gitlab@master

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

+- should_display_analytics_pages_in_sidebar = Feature.enabled?(:analytics_pages_under_project_analytics_sidebar, @project)
+
 .nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
   .nav-sidebar-inner-scroll
     - can_edit = can?(current_user, :admin_project, @project)
@@ -8,7 +10,9 @@
         .sidebar-context-title
           = @project.name
     %ul.sidebar-top-level-items
-      = nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do
+      - paths = sidebar_projects_paths
+      - paths << 'cycle_analytics#show' unless should_display_analytics_pages_in_sidebar
+      = nav_link(path: paths, html_options: { class: 'home' }) do
         = link_to project_path(@project), class: 'shortcuts-project rspec-project-link', data: { qa_selector: 'project_link' } do
           .nav-icon-container
             = sprite_icon('home')
@@ -34,15 +38,18 @@
               = link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do
                 %span= _('Releases')
-          - if can?(current_user, :read_cycle_analytics, @project)
-            = nav_link(path: 'cycle_analytics#show') do
-              = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
-                %span= _('Cycle Analytics')
-          = render_if_exists 'layouts/nav/project_insights_link'
+          - unless should_display_analytics_pages_in_sidebar
+            - if can?(current_user, :read_cycle_analytics, @project)
+              = nav_link(path: 'cycle_analytics#show') do
+                = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
+                  %span= _('Cycle Analytics')
+
+            = render_if_exists 'layouts/nav/project_insights_link'
+
       - if project_nav_tab? :files
-        = nav_link(controller: sidebar_repository_paths) do
+        = nav_link(controller: sidebar_repository_paths, unless: -> { should_display_analytics_pages_in_sidebar && current_path?('projects/graphs#charts') }) do
           = link_to project_tree_path(@project), class: 'shortcuts-tree qa-project-menu-repo' do
             .nav-icon-container
               = sprite_icon('doc-text')
@@ -83,9 +90,10 @@
               = link_to project_compare_index_path(@project, from: @repository.root_ref, to: current_ref) do
                 = _('Compare')
-            = nav_link(path: 'graphs#charts') do
-              = link_to charts_project_graph_path(@project, current_ref) do
-                = _('Charts')
+            - unless should_display_analytics_pages_in_sidebar
+              = nav_link(path: 'graphs#charts') do
+                = link_to charts_project_graph_path(@project, current_ref) do
+                  = _('Charts')
             = render_if_exists 'projects/sidebar/repository_locked_files'
@@ -170,7 +178,7 @@
                   = number_with_delimiter(@project.open_merge_requests_count)
       - if project_nav_tab? :pipelines
-        = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts]) do
+        = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts], unless: -> { should_display_analytics_pages_in_sidebar && current_path?('projects/pipelines#charts') }) do
           = link_to project_pipelines_path(@project), class: 'shortcuts-pipelines qa-link-pipelines rspec-link-pipelines', data: { qa_selector: 'ci_cd_link' } do
             .nav-icon-container
               = sprite_icon('rocket')
@@ -201,13 +209,13 @@
                     %span
                       = _('Artifacts')
-            - if project_nav_tab? :pipelines
+            - if !should_display_analytics_pages_in_sidebar && project_nav_tab?(:pipelines)
               = nav_link(controller: :pipeline_schedules) do
                 = link_to pipeline_schedules_path(@project), title: _('Schedules'), class: 'shortcuts-builds' do
                   %span
                     = _('Schedules')
-            - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
+            - if !should_display_analytics_pages_in_sidebar && @project.feature_available?(:builds, current_user) && !@project.empty_repo?
               = nav_link(path: 'pipelines#charts') do
                 = link_to charts_project_pipelines_path(@project), title: _('Charts'), class: 'shortcuts-pipelines-charts' do
                   %span
@@ -290,7 +298,7 @@
       = render_if_exists 'layouts/nav/sidebar/project_packages_link'
-      = render_if_exists 'layouts/nav/sidebar/project_analytics_link' # EE-specific
+      = render 'layouts/nav/sidebar/project_analytics_link'
       - if project_nav_tab? :wiki
         - wiki_url = project_wiki_path(@project, :home)
@@ -410,11 +418,12 @@
           = link_to project_network_path(@project, current_ref), title: _('Network'), class: 'shortcuts-network' do
             = _('Graph')
-      -# Shortcut to Repository > Charts (formerly, top-nav item "Graphs")
-      - unless @project.empty_repo?
-        %li.hidden
-          = link_to charts_project_graph_path(@project, current_ref), title: _('Charts'), class: 'shortcuts-repository-charts' do
-            = _('Charts')
+      - unless should_display_analytics_pages_in_sidebar
+        -# Shortcut to Repository > Charts (formerly, top-nav item "Graphs")
+        - unless @project.empty_repo?
+          %li.hidden
+            = link_to charts_project_graph_path(@project, current_ref), title: _('Charts'), class: 'shortcuts-repository-charts' do
+              = _('Charts')
       -# Shortcut to Issues > New Issue
       - if project_nav_tab?(:issues)

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

+- navbar_sub_item = project_analytics_navbar_links(@project, current_user).sort_by(&:title)
+- all_paths = navbar_sub_item.map(&:path)
+
+- if navbar_sub_item.any?
+  = nav_link(path: all_paths) do
+    = link_to navbar_sub_item.first.link, data: { qa_selector: 'project_analytics_link' } do
+      .nav-icon-container
+        = sprite_icon('chart')
+      %span.nav-item-name
+        = _('Analytics')
+
+    %ul.sidebar-sub-level-items
+      - navbar_sub_item.each do |menu_item|
+        = nav_link(path: menu_item.path) do
+          = link_to(menu_item.link, menu_item.link_to_options) do
+            %span= menu_item.title

app/workers/concerns/application_worker.rb

@@ -9,6 +9,7 @@ module ApplicationWorker
   include Sidekiq::Worker # rubocop:disable Cop/IncludeSidekiqWorker
   include WorkerAttributes
+  include WorkerContext
   included do
     set_queue

app/workers/concerns/cronjob_queue.rb

@@ -8,5 +8,6 @@ module CronjobQueue
   included do
     queue_namespace :cronjob
     sidekiq_options retry: false
+    worker_context project: nil, namespace: nil, user: nil
   end
 end

app/workers/concerns/worker_context.rb

+# frozen_string_literal: true
+
+module WorkerContext
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def worker_context(attributes)
+      @worker_context = Gitlab::ApplicationContext.new(attributes)
+    end
+
+    def get_worker_context
+      @worker_context || superclass_context
+    end
+
+    private
+
+    def superclass_context
+      return unless superclass.include?(WorkerContext)
+
+      superclass.get_worker_context
+    end
+  end
+
+  def with_context(context, &block)
+    Gitlab::ApplicationContext.new(context).use(&block)
+  end
+end

changelogs/unreleased/197925-setting-minimum-password-length-breaks-sign-up-with-saml.yml

----
-title: Fixes random passwords generated not conforming to minimum_password_length setting
-merge_request: 23387
-author:
-type: fixed

changelogs/unreleased/198030-fix-wrong-data.yml

----
-title: Remove invalid data from jira_tracker_data table
-merge_request: 23621
-author:
-type: fixed

changelogs/unreleased/198289-unable-to-sign-out-from-secondary-geo-node.yml

----
-title: Allow users to sign out on a read-only instance
-merge_request: 23545
-author:
-type: fixed

changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-api.yml

+---
+title: Add API endpoints for 'soft-delete for groups' feature
+merge_request: 19430
+author:
+type: added

changelogs/unreleased/39825-close-issue-after-error-resolve.yml

----
-title: Close Issue when resolving corresponding Sentry error
-merge_request: 22744
-author:
-type: added

changelogs/unreleased/jprovazn-fix-group-preloader.yml

----
-title: Fix loading of sub-epics caused by wrong subscription check.
-merge_request: 23184
-author:
-type: fixed

changelogs/unreleased/revert-22364.yml

----
-title: Reverts MR diff redesign which fixes Web IDE visual bugs including file dropdown
-  not showing up
-merge_request: 23428
-author:
-type: fixed

changelogs/unreleased/sh-add-missing-backtrace-define.yml

----
-title: Fix Bitbucket Server importer error handler
-merge_request: 23310
-author:
-type: fixed

changelogs/unreleased/sh-optimize-runners-admin-show.yml

+---
+title: Optimize page loading of Admin::RunnersController#show
+merge_request: 23309
+author:
+type: performance

doc/administration/audit_events.md

@@ -105,6 +105,7 @@ recorded:
 - Ask for password reset
 - Grant OAuth access
 - Started/stopped user impersonation
+- Changed username
 It is possible to filter particular actions by choosing an audit data type from
 the filter dropdown box. You can further filter by specific group, project or user

doc/api/groups.md

@@ -628,7 +628,12 @@ Feature.disable(:limit_projects_in_groups_api)
 ## Remove group
-Removes group with all projects inside. Only available to group owners and administrators.
+Only available to group owners and administrators.
+
+This endpoint either:
+
+- Removes group, and queues a background job to delete all projects in the group as well.
+- Since GitLab 12.8, on [Premium](https://about.gitlab.com/pricing/premium/) or higher tiers, marks a group for deletion. The deletion will happen 7 days later by default, but this can be changed in the [instance settings](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
 ```
 DELETE /groups/:id
@@ -636,10 +641,27 @@ DELETE /groups/:id
 Parameters:
-- `id` (required) - The ID or path of a user group
-This will queue a background job to delete all projects in the group. The
-response will be a 202 Accepted if the user has authorization.
+| Attribute       | Type           | Required | Description |
+| --------------- | -------------- | -------- | ----------- |
+| `id`            | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
+
+The response will be `202 Accepted` if the user has authorization.
+
+## Restore group marked for deletion **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/33257) in GitLab 12.8.
+
+Restores a group marked for deletion.
+
+```plaintext
+POST /groups/:id/restore
+```
+
+Parameters:
+| Attribute       | Type           | Required | Description |
+| --------------- | -------------- | -------- | ----------- |
+| `id`            | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
 ## Search for group

doc/api/projects.md

@@ -1769,7 +1769,7 @@ This endpoint either:
 - Removes a project including all associated resources (issues, merge requests etc).
 - From GitLab 12.6 on Premium or higher tiers, marks a project for deletion. Actual
   deletion happens after number of days specified in
-  [instance settings](../user/admin_area/settings/visibility_and_access_controls.md#project-deletion-adjourned-period-premium-only).
+  [instance settings](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
 ```
 DELETE /projects/:id
@@ -1781,6 +1781,8 @@ DELETE /projects/:id
 ## Restore project marked for deletion **(PREMIUM)**
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/32935) in GitLab 12.6.
+
 Restores project marked for deletion.
 ```

doc/api/settings.md

@@ -294,7 +294,7 @@ are listed in the descriptions of the relevant settings.
 | `plantuml_enabled`                       | boolean          | no                                   | (**If enabled, requires:** `plantuml_url`) Enable PlantUML integration. Default is `false`. |
 | `plantuml_url`                           | string           | required by: `plantuml_enabled`      | The PlantUML instance URL for integration. |
 | `polling_interval_multiplier`            | decimal          | no                                   | Interval multiplier used by endpoints that perform polling. Set to `0` to disable polling. |
-| `deletion_adjourned_period`      | integer          | no                                   | **(PREMIUM ONLY)** How many days after marking project for deletion it is actually removed. Value between 0 and 90.
+| `deletion_adjourned_period`      | integer          | no                                   | **(PREMIUM ONLY)** The number of days to wait before removing a project or group that is marked for deletion. Value must be between 0 and 90.
 | `project_export_enabled`                 | boolean          | no                                   | Enable project export. |
 | `prometheus_metrics_enabled`             | boolean          | no                                   | Enable Prometheus metrics. |
 | `protected_ci_variables`                 | boolean          | no                                   | Environment variables are protected by default. |

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -47,11 +47,13 @@ To ensure only admin users can delete projects:
 1. Check the **Default project deletion protection** checkbox.
 1. Click **Save changes**.
-## Project deletion adjourned period **(PREMIUM ONLY)**
+## Default deletion adjourned period **(PREMIUM ONLY)**
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/32935) in GitLab 12.6.
-By default, project marked for deletion will be permanently removed after 7 days. This period may be changed.
+By default, a project or group marked for removal will be permanently removed after 7 days.
+This period may be changed, and setting this period to 0 will enable immediate removal
+of projects or groups.
 To change this period:

doc/user/project/operations/error_tracking.md

@@ -57,11 +57,11 @@ This page has:
 - Other details about the issue, including a full stack trace.
 - In [GitLab 12.7 and newer](https://gitlab.com/gitlab-org/gitlab/issues/36246), language and urgency are displayed.
-By default, a **Create issue** button is displayed. Once you have used it to create an issue, the button is hidden.
+By default, a **Create issue** button is displayed:
 ![Error Details without Issue Link](img/error_details_v12_7.png)
-If a link does exist, it will be shown in the details and the 'Create issue' button will change to a 'View issue' button:
+If you create a GitLab issue from the error, the **Create issue** button will change to a **View issue** button:
 ![Error Details with Issue Link](img/error_details_with_issue_v12_7.png)