Add latest changes from gitlab-org/gitlab@master

9 files changed, 76 insertions, 105 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue
index d52726af02e..8ea5873f73a 100644
--- a/app/assets/javascripts/work_items/components/work_item_actions.vue
+++ b/app/assets/javascripts/work_items/components/work_item_actions.vue
@@ -13,7 +13,6 @@ import { s__ } from '~/locale';
 import Tracking from '~/tracking';
 import toast from '~/vue_shared/plugins/global_toast';
 import { isLoggedIn } from '~/lib/utils/common_utils';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   sprintfWorkItem,
   I18N_WORK_ITEM_DELETE,
@@ -51,7 +50,7 @@ export default {
   directives: {
     GlModal: GlModalDirective,
   },
-  mixins: [Tracking.mixin({ label: 'actions_menu' }), glFeatureFlagsMixin()],
+  mixins: [Tracking.mixin({ label: 'actions_menu' })],
   isLoggedIn: isLoggedIn(),
   notificationsToggleTestId: TEST_ID_NOTIFICATIONS_TOGGLE_ACTION,
   notificationsToggleFormTestId: TEST_ID_NOTIFICATIONS_TOGGLE_FORM,
@@ -126,11 +125,7 @@ export default {
       };
     },
     canPromoteToObjective() {
-      return (
-        this.glFeatures.workItemsMvc2 &&
-        this.canUpdate &&
-        this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT
-      );
+      return this.canUpdate && this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT;
     },
     objectiveWorkItemTypeId() {
       return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_VALUE_OBJECTIVE).id;
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index fa235f72e35..c93ef2287a8 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -102,7 +102,6 @@
   @include transition(color);
 }
 
-a,
 .notification-dot {
   @include transition(background-color, color, border);
 }
diff --git a/data/removals/16_0/16-0-phabricator-importer.yml b/data/removals/16_0/16-0-phabricator-importer.yml
new file mode 100644
index 00000000000..a46e6d81a9c
--- /dev/null
+++ b/data/removals/16_0/16-0-phabricator-importer.yml
@@ -0,0 +1,13 @@
+- title: "The Phabricator task importer"
+  announcement_milestone: "15.7"
+  removal_milestone: "16.0"
+  breaking_change: true
+  reporter: m_frankiewicz
+  stage: Manage
+  issue_url: https://gitlab.com/gitlab-com/Product/-/issues/4894
+  body: |
+    The [Phabricator task importer](https://docs.gitlab.com/ee/user/project/import/phabricator.html) was deprecated in
+    GitLab 15.7 and is removed in 16.0.
+
+    The Phabricator project hasn't been actively maintained since June 1, 2021. We haven't observed imports using this
+    tool. There has been no activity on the open related issues on GitLab.
diff --git a/doc/update/removals.md b/doc/update/removals.md
index 77da46b5fc4..444c2015700 100644
--- a/doc/update/removals.md
+++ b/doc/update/removals.md
@@ -389,6 +389,18 @@ Security reports that use schema version 14.x.x will cause an error in the pipel
 
 As of GitLab 16.0, GitLab Runner images based on Windows Server 2004 and 20H2 will not be provided as these operating systems are end-of-life.
 
+### The Phabricator task importer
+
+WARNING:
+This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
+Review the details carefully before upgrading.
+
+The [Phabricator task importer](https://docs.gitlab.com/ee/user/project/import/phabricator.html) was deprecated in
+GitLab 15.7 and is removed in 16.0.
+
+The Phabricator project hasn't been actively maintained since June 1, 2021. We haven't observed imports using this
+tool. There has been no activity on the open related issues on GitLab.
+
 ### The stable Terraform CI/CD template has been replaced with the latest template
 
 WARNING:
diff --git a/doc/user/okrs.md b/doc/user/okrs.md
index 675d2d7ad5f..030f6eb82ef 100644
--- a/doc/user/okrs.md
+++ b/doc/user/okrs.md
@@ -220,6 +220,20 @@ To set health status of an OKR:
 1. [Open the key result](okrs.md#view-a-key-result) that you want to edit.
 1. Next to **Health status**, select the dropdown list and select the desired health status.
 
+## Promote a key result to an objective
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/386877) in GitLab 16.0.
+
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
+To promote a key result:
+
+1. [Open the key result](#view-a-key-result).
+1. In the top right corner, select the vertical ellipsis (**{ellipsis_v}**)..
+1. Select **Promote to objective**.
+
 ## Close an OKR
 
 When an OKR is achieved, you can close it.
diff --git a/lib/gitlab/ci/templates/Pages/Zola.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Zola.gitlab-ci.yml
deleted file mode 100644
index 0ce7bface66..00000000000
--- a/lib/gitlab/ci/templates/Pages/Zola.gitlab-ci.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Pages/Zola.gitlab-ci.yml
-
----
-# From: https://www.getzola.org/documentation/deployment/gitlab-pages/
-# Source template is slightly modified to be self-contained
-
-pages:
-  image: alpine:latest
-  variables:
-    # This variable will ensure that the CI runner pulls in your theme from the submodule
-    GIT_SUBMODULE_STRATEGY: recursive
-  before_script:
-    # Install the zola package from the alpine community repositories
-    - apk add --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ zola
-  script:
-    # Execute zola build
-    - zola build --base-url "$CI_PAGES_URL"
-  artifacts:
-    paths:
-      # Path of our artifacts
-      - public
-  # This config will only publish changes that are pushed on the default branch
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  environment: production
diff --git a/qa/spec/runtime/env_spec.rb b/qa/spec/runtime/env_spec.rb
index 66720937007..afd7146a81a 100644
--- a/qa/spec/runtime/env_spec.rb
+++ b/qa/spec/runtime/env_spec.rb
@@ -282,9 +282,13 @@ RSpec.describe QA::Runtime::Env do
   end
 
   describe 'remote grid credentials' do
-    it 'is blank if username is empty' do
+    before do
       stub_env('QA_REMOTE_GRID_USERNAME', nil)
+      stub_env('QA_REMOTE_GRID_ACCESS_KEY', nil)
+      stub_env('QA_REMOTE_GRID', nil)
+    end
 
+    it 'is blank if username is empty' do
       expect(described_class.send(:remote_grid_credentials)).to eq('')
     end
 
@@ -300,42 +304,41 @@ RSpec.describe QA::Runtime::Env do
 
       expect(described_class.send(:remote_grid_credentials)).to eq('foo:bar@')
     end
-  end
 
-  describe '.remote_grid_protocol' do
-    it 'defaults protocol to http' do
-      stub_env('QA_REMOTE_GRID_PROTOCOL', nil)
-      expect(described_class.remote_grid_protocol).to eq('http')
+    describe '.remote_grid_protocol' do
+      it 'defaults protocol to http' do
+        expect(described_class.remote_grid_protocol).to eq('http')
+      end
     end
-  end
 
-  describe '.remote_grid' do
-    it 'is falsey if QA_REMOTE_GRID is not set' do
-      expect(described_class.remote_grid).to be_falsey
-    end
+    describe '.remote_grid' do
+      it 'is falsey if QA_REMOTE_GRID is not set' do
+        expect(described_class.remote_grid).to be_falsey
+      end
 
-    it 'accepts https protocol' do
-      stub_env('QA_REMOTE_GRID', 'localhost:4444')
-      stub_env('QA_REMOTE_GRID_PROTOCOL', 'https')
+      it 'accepts https protocol' do
+        stub_env('QA_REMOTE_GRID', 'localhost:4444')
+        stub_env('QA_REMOTE_GRID_PROTOCOL', 'https')
 
-      expect(described_class.remote_grid).to eq('https://localhost:4444/wd/hub')
-    end
+        expect(described_class.remote_grid).to eq('https://localhost:4444/wd/hub')
+      end
 
-    context 'with credentials' do
-      it 'has a grid of http://user:key@grid/wd/hub' do
-        stub_env('QA_REMOTE_GRID_USERNAME', 'foo')
-        stub_env('QA_REMOTE_GRID_ACCESS_KEY', 'bar')
-        stub_env('QA_REMOTE_GRID', 'localhost:4444')
+      context 'with credentials' do
+        it 'has a grid of http://user:key@grid/wd/hub' do
+          stub_env('QA_REMOTE_GRID_USERNAME', 'foo')
+          stub_env('QA_REMOTE_GRID_ACCESS_KEY', 'bar')
+          stub_env('QA_REMOTE_GRID', 'localhost:4444')
 
-        expect(described_class.remote_grid).to eq('http://foo:bar@localhost:4444/wd/hub')
+          expect(described_class.remote_grid).to eq('http://foo:bar@localhost:4444/wd/hub')
+        end
       end
-    end
 
-    context 'without credentials' do
-      it 'has a grid of http://grid/wd/hub' do
-        stub_env('QA_REMOTE_GRID', 'localhost:4444')
+      context 'without credentials' do
+        it 'has a grid of http://grid/wd/hub' do
+          stub_env('QA_REMOTE_GRID', 'localhost:4444')
 
-        expect(described_class.remote_grid).to eq('http://localhost:4444/wd/hub')
+          expect(described_class.remote_grid).to eq('http://localhost:4444/wd/hub')
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb
deleted file mode 100644
index 4f80ae0054b..00000000000
--- a/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Pages/Zola.gitlab-ci.yml', feature_category: :pages do
-  subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Pages/Zola') }
-
-  describe 'the created pipeline' do
-    let_it_be(:project) { create(:project, :repository) }
-
-    let(:user) { project.first_owner }
-    let(:service) { Ci::CreatePipelineService.new(project, user, ref: project.default_branch) }
-    let(:pipeline) { service.execute(:push).payload }
-    let(:build_names) { pipeline.builds.pluck(:name) }
-
-    before do
-      stub_ci_pipeline_yaml_file(template.content)
-      allow(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
-    end
-
-    it 'creates "pages" job' do
-      expect(build_names).to include('pages')
-    end
-  end
-end
diff --git a/vendor/gems/bundler-checksum/.gitlab-ci.yml b/vendor/gems/bundler-checksum/.gitlab-ci.yml
index 3ab05a9e42b..2de1c5e982c 100644
--- a/vendor/gems/bundler-checksum/.gitlab-ci.yml
+++ b/vendor/gems/bundler-checksum/.gitlab-ci.yml
@@ -2,7 +2,8 @@ workflow:
   rules:
     - if: $CI_MERGE_REQUEST_ID
 
-.test:
+rspec:
+  image: "ruby:${RUBY_VERSION}"
   cache:
     key: bundler-checksum
     paths:
@@ -18,19 +19,6 @@ workflow:
     - bundle install -j $(nproc)
   script:
     - pushd test/project_with_checksum_lock && scripts/test
-
-test-2.7:
-  image: "ruby:2.7"
-  extends: .test
-
-test-3.0:
-  image: "ruby:3.0"
-  extends: .test
-
-rspec-3.1:
-  image: "ruby:3.1"
-  extends: .test
-
-rspec-3.2:
-  image: "ruby:3.2"
-  extends: .test
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]