Add latest changes from gitlab-org/gitlab@master

.github/ISSUE_TEMPLATE.md

 We’re closing our issue tracker on GitHub so we can focus on the GitLab.com project and respond to issues more quickly.
-We encourage you to open an issue on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues). You can log into GitLab.com using your GitHub account.
+We encourage you to open an issue on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab/issues). You can log into GitLab.com using your GitHub account.

.github/PULL_REQUEST_TEMPLATE.md

 Thank you for taking the time to contribute back to GitLab!
-Please open a merge request [on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests), we look forward to reviewing your contribution! You can log into GitLab.com using your GitHub account.
+Please open a merge request [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/merge_requests), we look forward to reviewing your contribution! You can log into GitLab.com using your GitHub account.

.gitlab/ci/qa.gitlab-ci.yml

@@ -24,17 +24,6 @@ package-and-qa-manual:
   when: manual
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
-package-and-qa-manual:master:
-  extends:
-    - .package-and-qa-base
-    - .only-code-qa-changes
-  only:
-    refs:
-      - master@gitlab-org/gitlab-foss
-      - master@gitlab-org/gitlab
-  when: manual
-  needs: ["build-qa-image", "gitlab:assets:compile"]
-
 package-and-qa:
   extends:
     - .package-and-qa-base
@@ -44,3 +33,14 @@ package-and-qa:
       - master
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   allow_failure: true
+
+schedule:package-and-qa:
+  extends:
+    - .package-and-qa-base
+    - .only-code-qa-changes
+  only:
+    refs:
+      - schedules@gitlab-org/gitlab
+      - schedules@gitlab-org/gitlab-foss
+  needs: ["build-qa-image", "gitlab:assets:compile"]
+  allow_failure: true

.gitlab/issue_templates/Bug.md

@@ -2,17 +2,10 @@
 Please read this!
 Before opening a new issue, make sure to search for keywords in the issues
-filtered by the "regression" or "bug" label.
-For the Community Edition issue tracker:
-
-- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=regression
-- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=bug
-
-For the Enterprise Edition issue tracker:
-
-- https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=regression
-- https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=bug
+filtered by the "regression" or "bug" label:
+- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression
+- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=bug
 and verify the issue you're about to submit isn't a duplicate.
 --->

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -24,7 +24,7 @@ Remove the `:feature_name` feature flag ...
 If applicable, any groups/projects that are happy to have this feature turned on early. Some organizations may wish to test big changes they are interested in with a small subset of users ahead of time for example.
-- `gitlab-org/gitlab-ce`/`gitlab-org/gitlab-ee` projects
+- `gitlab-org/gitlab` project
 - `gitlab-org`/`gitlab-com` groups
 - ...

.gitlab/issue_templates/Problem_Validation.md

@@ -26,7 +26,7 @@
 ## Confidence
-<!-- How do we know this is a problem? Please provide and link to any supporting information (e.g. data, customer verbatims) and use this basis to provide a numerical assessment on our confidence level in this problem's severity: 
+<!-- How do we know this is a problem? Please provide and link to any supporting information (e.g. data, customer verbatims) and use this basis to provide a numerical assessment on our confidence level in this problem's severity:
 100% = High confidence
 80% = Medium confidence
@@ -34,7 +34,7 @@
 ## Effort
-<!-- How much effort do we think it will be to solve this problem? Please include all counterparts (Product, UX, Engineering, etc) in your assessment and quantify the number of person-months needed to dedicate to the effort. 
+<!-- How much effort do we think it will be to solve this problem? Please include all counterparts (Product, UX, Engineering, etc) in your assessment and quantify the number of person-months needed to dedicate to the effort.
 For example, if the solution will take a product manager, designer, and engineer two weeks of effort - you may quantify this as 1.5 (based on 0.5 months x 3 people). -->

.gitlab/issue_templates/Security Release.md

@@ -18,13 +18,7 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X`
 ## Security Issues:
-### CE
-
-* {https://gitlab.com/gitlab-org/gitlab-ce/issues link}
-
-### EE
-
-* {https://gitlab.com/gitlab-org/gitlab-ee/issues link}
+* {https://gitlab.com/gitlab-org/gitlab/issues link}
 ## Security Issues in dev.gitlab.org:

.gitlab/issue_templates/Test plan.md

@@ -2,7 +2,7 @@
 <!-- This issue outlines testing activities related to a particular issue or epic.
-[Here is an example test plan](https://gitlab.com/gitlab-org/gitlab-ce/issues/50353)
+[Here is an example test plan](https://gitlab.com/gitlab-org/gitlab-foss/issues/50353)
 This and other comments should be removed as you write the plan -->
@@ -63,7 +63,7 @@ intersection of Components and Attributes.
 Some features might be simple enough that they only involve one Component, while
 more complex features could involve multiple or even all.
-Example (from https://gitlab.com/gitlab-org/gitlab-ce/issues/50353):
+Example (from https://gitlab.com/gitlab-org/gitlab-foss/issues/50353):
 * Repository is
   * Intuitive
     * It's easy to select the desired file template

app/assets/javascripts/registry/components/app.vue

@@ -47,7 +47,7 @@ export default {
     dockerConnectionErrorText() {
       return sprintf(
         s__(`ContainerRegistry|We are having trouble connecting to Docker, which could be due to an
-            issue with your project name or path. 
+            issue with your project name or path.
             %{docLinkStart}More Information%{docLinkEnd}`),
         {
           docLinkStart: `<a href="${this.helpPagePath}#docker-connection-error" target="_blank">`,
@@ -58,8 +58,8 @@ export default {
     },
     introText() {
       return sprintf(
-        s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every 
-            project can have its own space to store its Docker images. 
+        s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every
+            project can have its own space to store its Docker images.
             %{docLinkStart}More Information%{docLinkEnd}`),
         {
           docLinkStart: `<a href="${this.helpPagePath}" target="_blank">`,
@@ -109,7 +109,7 @@ export default {
       :svg-path="containersErrorImage"
     >
       <template #description>
-        <p v-html="dockerConnectionErrorText"></p>
+        <p class="js-character-error-text" v-html="dockerConnectionErrorText"></p>
       </template>
     </gl-empty-state>

app/assets/javascripts/registry/components/collapsible_container.vue

@@ -49,7 +49,7 @@ export default {
       }
     },
     handleDeleteRepository() {
-      this.deleteItem(this.repo)
+      return this.deleteItem(this.repo)
         .then(() => {
           createFlash(__('This container registry has been scheduled for deletion.'), 'notice');
           this.fetchRepos();
@@ -67,7 +67,8 @@ export default {
   <div class="container-image">
     <div class="container-image-head">
       <gl-button class="js-toggle-repo btn-link align-baseline" @click="toggleRepo">
-        <icon :name="iconName" /> {{ repo.name }}
+        <icon :name="iconName" />
+        {{ repo.name }}
       </gl-button>
       <clipboard-button

app/assets/javascripts/registry/components/table_registry.vue

@@ -198,8 +198,9 @@ export default {
               :title="s__('ContainerRegistry|Remove selected images')"
               :aria-label="s__('ContainerRegistry|Remove selected images')"
               @click="deleteMultipleItems()"
-              ><icon name="remove"
-            /></gl-button>
+            >
+              <icon name="remove" />
+            </gl-button>
           </th>
         </tr>
       </thead>
@@ -223,9 +224,9 @@ export default {
             />
           </td>
           <td>
-            <span v-gl-tooltip.bottom class="monospace" :title="item.revision">
-              {{ item.shortRevision }}
-            </span>
+            <span v-gl-tooltip.bottom class="monospace" :title="item.revision">{{
+              item.shortRevision
+            }}</span>
           </td>
           <td>
             {{ formatSize(item.size) }}
@@ -236,9 +237,9 @@ export default {
           </td>
           <td>
-            <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)">
-              {{ timeFormated(item.createdAt) }}
-            </span>
+            <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)">{{
+              timeFormated(item.createdAt)
+            }}</span>
           </td>
           <td class="content action-buttons">
@@ -262,6 +263,7 @@ export default {
       v-if="shouldRenderPagination"
       :change="onPageChange"
       :page-info="repo.pagination"
+      class="js-registry-pagination"
     />
     <gl-modal ref="deleteModal" :modal-id="modalId" ok-variant="danger">

app/finders/clusters/kubernetes_namespace_finder.rb

@@ -2,12 +2,12 @@
 module Clusters
   class KubernetesNamespaceFinder
-    attr_reader :cluster, :project, :environment_slug
-    def initialize(cluster, project:, environment_slug:, allow_blank_token: false)
+    attr_reader :cluster, :project, :environment_name
+    def initialize(cluster, project:, environment_name:, allow_blank_token: false)
       @cluster = cluster
       @project = project
-      @environment_slug = environment_slug
+      @environment_name = environment_name
       @allow_blank_token = allow_blank_token
     end
@@ -20,7 +20,11 @@ module Clusters
     attr_reader :allow_blank_token
     def find_namespace(with_environment:)
-      relation = with_environment ? namespaces.with_environment_slug(environment_slug) : namespaces
+      relation = if with_environment
+                   namespaces.with_environment_name(environment_name)
+                 else
+                   namespaces
+                 end
       relation.find_by_project_id(project.id)
     end

app/models/clusters/cluster.rb

@@ -172,7 +172,7 @@ module Clusters
       persisted_namespace = Clusters::KubernetesNamespaceFinder.new(
         self,
         project: project,
-        environment_slug: environment.slug
+        environment_name: environment.name
       ).execute
       persisted_namespace&.namespace || Gitlab::Kubernetes::DefaultNamespace.new(self, project: project).from_environment_slug(environment.slug)

app/models/clusters/kubernetes_namespace.rb

@@ -27,7 +27,7 @@ module Clusters
         algorithm: 'aes-256-cbc'
     scope :has_service_account_token, -> { where.not(encrypted_service_account_token: nil) }
-    scope :with_environment_slug, -> (slug) { joins(:environment).where(environments: { slug: slug }) }
+    scope :with_environment_name, -> (name) { joins(:environment).where(environments: { name: name }) }
     def token_name
       "#{namespace}-token"

app/models/clusters/platforms/kubernetes.rb

@@ -105,19 +105,11 @@ module Clusters
       private
-      ##
-      # Environment slug can be predicted given an environment
-      # name, so even if the environment isn't persisted yet we
-      # still know what to look for.
-      def environment_slug(name)
-        Gitlab::Slug::Environment.new(name).generate
-      end
-
       def find_persisted_namespace(project, environment_name:)
         Clusters::KubernetesNamespaceFinder.new(
           cluster,
           project: project,
-          environment_slug: environment_slug(environment_name)
+          environment_name: environment_name
         ).execute
       end

changelogs/unreleased/sh-fix-any-approver-handling.yml

+---
+title: Fix bug that caused a merge to show an error message
+merge_request: 17466
+author:
+type: fixed

doc/development/pipelines.md

@@ -134,7 +134,7 @@ graph RL;
   M[coverage];
   N[pages];
   O[static-analysis];
-  P["package-and-qa-manual:master<br/>(master schedule only)"];
+  P["schedule:package-and-qa<br/>(master schedule only)"];
   Q[package-and-qa];
   R[package-and-qa-manual];

lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb

@@ -36,7 +36,7 @@ module Gitlab
               Clusters::KubernetesNamespaceFinder.new(
                 deployment_cluster,
                 project: environment.project,
-                environment_slug: environment.slug,
+                environment_name: environment.name,
                 allow_blank_token: true
               ).execute
             end

spec/finders/clusters/kubernetes_namespace_finder_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Clusters::KubernetesNamespaceFinder do
     described_class.new(
       cluster,
       project: project,
-      environment_slug: 'production',
+      environment_name: 'production',
       allow_blank_token: allow_blank_token
     )
   end
@@ -22,8 +22,8 @@ RSpec.describe Clusters::KubernetesNamespaceFinder do
   end
   describe '#execute' do
-    let(:production) { create(:environment, project: project, slug: 'production') }
-    let(:staging) { create(:environment, project: project, slug: 'staging') }
+    let(:production) { create(:environment, project: project, name: 'production') }
+    let(:staging) { create(:environment, project: project, name: 'staging') }
     let(:cluster) { create(:cluster, :group, :provided_by_user) }
     let(:project) { create(:project) }