Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue

@@ -342,7 +342,6 @@ export default {
         :empty-text="s__('ClusterIntegration|Kubernetes version not found')"
         @input="setKubernetesVersion({ kubernetesVersion: $event })"
       />
-      <p class="form-text text-muted" v-html="roleDropdownHelpText"></p>
     </div>
     <div class="form-group">
       <label class="label-bold" for="eks-role">{{ s__('ClusterIntegration|Role name') }}</label>

app/assets/javascripts/lib/utils/datetime_utility.js

@@ -392,15 +392,21 @@ export const getTimeframeWindowFrom = (initialStartDate, length) => {
  * @param {Date} date
  * @param {Array} quarter
  */
-export const dayInQuarter = (date, quarter) =>
-  quarter.reduce((acc, month) => {
-    if (date.getMonth() > month.getMonth()) {
+export const dayInQuarter = (date, quarter) => {
+  const dateValues = {
+    date: date.getDate(),
+    month: date.getMonth(),
+  };
+
+  return quarter.reduce((acc, month) => {
+    if (dateValues.month > month.getMonth()) {
       return acc + totalDaysInMonth(month);
-    } else if (date.getMonth() === month.getMonth()) {
-      return acc + date.getDate();
+    } else if (dateValues.month === month.getMonth()) {
+      return acc + dateValues.date;
     }
     return acc + 0;
   }, 0);
+};
 
 window.gl = window.gl || {};
 window.gl.utils = {

app/views/layouts/application.html.haml

+- page_classes = page_class << @html_class
+- page_classes = page_classes.flatten.compact
+
 !!! 5
-%html{ lang: I18n.locale, class: page_class }
+%html{ lang: I18n.locale, class: page_classes }
   = render "layouts/head"
   %body{ class: "#{user_application_theme} #{@body_class} #{client_class_list}", data: body_data }
     = render "layouts/init_auto_complete" if @gfm_form

changelogs/unreleased/eks-kubernetes-version-helptext.yml

+---
+title: Removes incorrect help text from EKS Kubernetes version field
+merge_request:
+author:
+type: fixed

doc/user/project/clusters/add_remove_clusters.md

@@ -719,9 +719,12 @@ To disable the Kubernetes cluster integration, follow the same procedure.
 
 ## Removing integration
 
-To remove the Kubernetes cluster integration from your project, simply click the
-**Remove integration** button. You will then be able to follow the procedure
-and add a Kubernetes cluster again.
+To remove the Kubernetes cluster integration from your project, either:
+
+- Select **Remove integration**, to remove only the Kubernetes integration.
+- [From GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/issues/26815), select
+  **Remove integration and resources**, to also remove all related GitLab cluster resources (for
+  example, namespaces, roles, and bindings) when removing the integration.
 
 When removing the cluster integration, note:
 
@@ -730,10 +733,6 @@ When removing the cluster integration, note:
 - When you remove a cluster, you only remove its relationship to GitLab, not the cluster itself. To
   remove the cluster, you can do so by visiting the GKE or EKS dashboard, or using `kubectl`.
 
-[From GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/issues/26815), you can also remove all
-related GitLab cluster resources (for example, namespaces, roles, and bindings) when removing the
-integration.
-
 ## Learn more
 
 To learn more on automatically deploying your applications,

doc/user/project/members/index.md

@@ -28,7 +28,7 @@ From the image above, we can deduce the following things:
   there is an indication of an ancestor group and inherited Owner permissions.
 
 [From GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/issues/21727), you can filter this list
-using dropdown on the right side:
+using the dropdown on the right side:
 
 ![Project members filter](img/project_members_filter_v12_6.png)
 

package.json

@@ -131,7 +131,7 @@
     "vue-loader": "^15.7.1",
     "vue-router": "^3.0.2",
     "vue-template-compiler": "^2.6.10",
-    "vue-virtual-scroll-list": "^1.3.1",
+    "vue-virtual-scroll-list": "^1.4.4",
     "vuedraggable": "^2.23.0",
     "vuex": "^3.1.0",
     "webpack": "^4.40.2",

yarn.lock

@@ -11710,10 +11710,10 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue-virtual-scroll-list@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.3.1.tgz#efcb83d3a3dcc69cd886fa4de1130a65493e8f76"
-  integrity sha512-PMTxiK9/P1LtgoWWw4n1QnmDDkYqIdWWCNdt1L4JD9g6rwDgnsGsSV10bAnd5n7DQLHGWHjRex+zAbjXWT8t0g==
+vue-virtual-scroll-list@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.4.tgz#5fca7a13f785899bbfb70471ec4fe222437d8495"
+  integrity sha512-wU7FDpd9Xy4f62pf8SBg/ak21jMI/pdx4s4JPah+z/zuhmeAafQgp8BjtZvvt+b0BZOsOS1FJuCfUH7azTkivQ==
 
 vue@^2.6.10:
   version "2.6.10"