Add latest changes from gitlab-org/gitlab@master

.gitlab/ci/review.gitlab-ci.yml

@@ -69,7 +69,7 @@ review-build-cng:
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
-    GITLAB_HELM_CHART_REF: "v2.5.1"
+    GITLAB_HELM_CHART_REF: "v2.6.8"
     GITLAB_EDITION: "ce"
   environment:
     name: review/${CI_COMMIT_REF_NAME}

Gemfile

@@ -383,7 +383,7 @@ group :development, :test do
   gem 'simple_po_parser', '~> 1.1.2', require: false
-  gem 'timecop', '~> 0.8.0'
+  gem 'timecop', '~> 0.9.1'
   gem 'png_quantizator', '~> 0.2.1', require: false

Gemfile.lock

@@ -1065,7 +1065,7 @@ GEM
     thread_safe (0.3.6)
     thrift (0.11.0.0)
     tilt (2.0.10)
-    timecop (0.8.1)
+    timecop (0.9.1)
     timfel-krb5-auth (0.8.3)
     toml (0.2.0)
       parslet (~> 1.8.0)
@@ -1387,7 +1387,7 @@ DEPENDENCIES
   sys-filesystem (~> 1.1.6)
   test-prof (~> 0.10.0)
   thin (~> 1.7.0)
-  timecop (~> 0.8.0)
+  timecop (~> 0.9.1)
   toml-rb (~> 1.0.0)
   truncato (~> 0.7.11)
   u2f (~> 0.2.1)

app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js

@@ -4,6 +4,7 @@ import AjaxVariableList from '~/ci_variable_list/ajax_variable_list';
 import registrySettingsApp from '~/registry/settings/registry_settings_bundle';
 import initVariableList from '~/ci_variable_list';
 import DueDateSelectors from '~/due_date_select';
+import initDeployKeys from '~/deploy_keys';
 document.addEventListener('DOMContentLoaded', () => {
   // Initialize expandable settings panels
@@ -44,4 +45,5 @@ document.addEventListener('DOMContentLoaded', () => {
   new DueDateSelectors();
   registrySettingsApp();
+  initDeployKeys();
 });

app/assets/javascripts/pages/projects/settings/repository/form.js

@@ -3,7 +3,6 @@
 import ProtectedTagCreate from '~/protected_tags/protected_tag_create';
 import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
 import initSettingsPanels from '~/settings_panels';
-import initDeployKeys from '~/deploy_keys';
 import ProtectedBranchCreate from '~/protected_branches/protected_branch_create';
 import ProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list';
 import DueDateSelectors from '~/due_date_select';
@@ -12,7 +11,6 @@ import fileUpload from '~/lib/utils/file_upload';
 export default () => {
   new ProtectedTagCreate();
   new ProtectedTagEditList();
-  initDeployKeys();
   initSettingsPanels();
   new ProtectedBranchCreate();
   new ProtectedBranchEditList();

app/controllers/admin/application_settings_controller.rb

@@ -244,6 +244,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def render_update_error
     action = valid_setting_panels.include?(action_name) ? action_name : :general
+    flash[:alert] = _('Application settings update failed')
+
     render action
   end

app/controllers/projects/deploy_keys_controller.rb

 # frozen_string_literal: true
 class Projects::DeployKeysController < Projects::ApplicationController
-  include RepositorySettingsRedirect
   respond_to :html
   # Authorize
@@ -12,7 +11,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   def index
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
+      format.html { redirect_to_ci_cd_settings }
       format.json do
         render json: Projects::Settings::DeployKeysPresenter.new(@project, current_user: current_user).as_json
       end
@@ -20,7 +19,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   end
   def new
-    redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
+    redirect_to_ci_cd_settings
   end
   def create
@@ -30,7 +29,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
       flash[:alert] = @key.errors.full_messages.join(', ').html_safe
     end
-    redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
+    redirect_to_ci_cd_settings
   end
   def edit
@@ -39,7 +38,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   def update
     if deploy_key.update(update_params)
       flash[:notice] = _('Deploy key was successfully updated.')
-      redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
+      redirect_to_ci_cd_settings
     else
       render 'edit'
     end
@@ -51,7 +50,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
     return render_404 unless key
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
+      format.html { redirect_to_ci_cd_settings }
       format.json { head :ok }
     end
   end
@@ -62,7 +61,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
     return render_404 unless deploy_key_project
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
+      format.html { redirect_to_ci_cd_settings }
       format.json { head :ok }
     end
   end
@@ -97,4 +96,8 @@ class Projects::DeployKeysController < Projects::ApplicationController
       access_denied!
     end
   end
+
+  def redirect_to_ci_cd_settings
+    redirect_to project_settings_ci_cd_path(@project, anchor: 'js-deploy-keys-settings')
+  end
 end

app/controllers/projects/settings/ci_cd_controller.rb

@@ -101,6 +101,7 @@ module Projects
         define_triggers_variables
         define_badges_variables
         define_auto_devops_variables
+        define_deploy_keys
       end
       def define_runners_variables
@@ -153,6 +154,10 @@ module Projects
         @new_deploy_token = DeployToken.new
       end
+
+      def define_deploy_keys
+        @deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user)
+      end
     end
   end
 end

app/controllers/projects/settings/repository_controller.rb

@@ -27,8 +27,6 @@ module Projects
       private
       def render_show
-        @deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user)
-
         define_protected_refs
         remote_mirror

app/models/ci/bridge.rb

@@ -167,7 +167,10 @@ module Ci
         target_revision: {
           ref: target_ref || downstream_project.default_branch
         },
-        execute_params: { ignore_skip_ci: true }
+        execute_params: {
+          ignore_skip_ci: true,
+          bridge: self
+        }
       }
     end

app/models/namespace.rb

@@ -130,7 +130,7 @@ class Namespace < ApplicationRecord
       return unless host.ends_with?(gitlab_host)
       name = host.delete_suffix(gitlab_host)
-      Namespace.find_by_full_path(name)
+      Namespace.find_by_path(name)
     end
     # overridden in ee

app/services/ci/create_cross_project_pipeline_service.rb

@@ -20,12 +20,6 @@ module Ci
       service.execute(
         pipeline_params.fetch(:source), pipeline_params[:execute_params]) do |pipeline|
-          @bridge.sourced_pipelines.build(
-            source_pipeline: @bridge.pipeline,
-            source_project: @bridge.project,
-            project: @bridge.downstream_project,
-            pipeline: pipeline)
-
           pipeline.variables.build(@bridge.downstream_variables)
         end
     end

app/services/ci/create_pipeline_service.rb

@@ -7,6 +7,7 @@ module Ci
     CreateError = Class.new(StandardError)
     SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Build,
+                Gitlab::Ci::Pipeline::Chain::Build::Associations,
                 Gitlab::Ci::Pipeline::Chain::Validate::Abilities,
                 Gitlab::Ci::Pipeline::Chain::Validate::Repository,
                 Gitlab::Ci::Pipeline::Chain::Config::Content,

app/views/projects/settings/ci_cd/show.html.haml

@@ -54,6 +54,8 @@
 = render "shared/deploy_tokens/index", group_or_project: @project, description: deploy_token_description
+= render @deploy_keys
+
 %section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) }
   .settings-header
     %h4

app/views/projects/settings/repository/show.html.haml

@@ -11,8 +11,6 @@
 -# Those are used throughout the actual views. These `shared` views are then
 -# reused in EE.
 = render "projects/settings/repository/protected_branches"
-
-= render @deploy_keys
 = render "projects/cleanup/show"
 = render_if_exists 'shared/promotions/promote_repository_features'

changelogs/unreleased/13005-allow-to-use-issue-issues-and-merge_request-merge_requests-for-issu.yml

+---
+title: Allow issues/merge_requests as an issuable_type in Insights configuration
+merge_request: 26061
+author:
+type: added

changelogs/unreleased/199370-move-deploy_keys-to-cicd.yml

+---
+title: Moved Deploy Keys from Repository to CI/CD settings.
+merge_request: 25444
+author:
+type: changed

changelogs/unreleased/dz-scope-issue-route-default.yml

+---
+title: Move issues routes under /-/ scope
+merge_request: 24791
+author:
+type: changed

config/routes/project.rb

@@ -279,6 +279,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
+        draw :issues
         draw :merge_requests
         # The wiki and repository routing contains wildcard characters so
@@ -401,12 +402,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       # Unscoped route. It will be replaced with redirect to /-/issues/
       # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
-      draw :issues
-
-      # To ensure an old unscoped routing is used for the UI we need to
-      # add prefix 'as' to the scope routing and place it below original routing.
-      # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
-      scope '-', as: 'scoped' do
+      scope as: 'deprecated' do
         draw :issues
       end

doc/development/fe_guide/dependencies.md

+# Frontend dependencies
+
+## Package manager
+
+We use [Yarn](https://yarnpkg.com/) to manage frontend dependencies. There are a few exceptions:
+
+- [FontAwesome](https://fontawesome.com/), installed via the `font-awesome-rails` gem: we are working to replace it with
+  [GitLab SVGs](https://gitlab-org.gitlab.io/gitlab-svgs/) icons library.
+- [ACE](https://ace.c9.io/) editor, installed via the `ace-rails-ap` gem.
+- Other dependencies found under `vendor/assets/`.
+
+## Updating dependencies
+
+### Renovate GitLab Bot
+
+We use the [Renovate GitLab Bot](https://gitlab.com/gitlab-org/frontend/renovate-gitlab-bot) to
+automatically create merge requests for updating dependencies of several projects. You can find the
+up-to-date list of projects managed by the renovate bot in the project’s README. Some key dependencies
+updated using renovate are:
+
+- [`@gitlab/ui`](https://gitlab.com/gitlab-org/gitlab-ui/)
+- [`@gitlab/svgs`](https://gitlab.com/gitlab-org/gitlab-svgs/)
+- [`@gitlab/eslint-config`](https://gitlab.com/gitlab-org/gitlab-eslint-config)
+
+### Blocked dependencies
+
+We discourage installing some dependencies in [GitLab repository](https://gitlab.com/gitlab-org/gitlab)
+because they can create conflicts in the dependency tree. Blocked dependencies are declared in the
+`blockDependencies` property of GitLab’s [`package.json` file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/package.json).
+
+## Dependency notes
+
+### BootstrapVue
+
+[BootstrapVue](https://bootstrap-vue.js.org/) is a component library built with Vue.js and Bootstrap.
+We wrap BootstrapVue components in [GitLab UI](https://gitlab.com/gitlab-org/gitlab-ui/) with the
+purpose of applying visual styles and usage guidelines specified in the
+[Pajamas Design System](https://design.gitlab.com/). For this reason, we recommend not installing
+BootstrapVue directly in the GitLab repository. Instead create a wrapper of the BootstrapVue
+component you want to use in GitLab UI first.