Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/jobs/components/environments_block.vue

@@ -79,7 +79,9 @@ export default {
         default:
           break;
       }
-      return environmentText;
+      return environmentText && this.hasCluster
+        ? `${environmentText} ${this.clusterText}`
+        : environmentText;
     },
     environmentLink() {
       if (this.hasEnvironment) {
@@ -109,6 +111,37 @@ export default {
         ? this.lastDeployment.deployable.build_path
         : '';
     },
+    hasCluster() {
+      return this.hasLastDeployment && this.lastDeployment.cluster;
+    },
+    clusterNameOrLink() {
+      if (!this.hasCluster) {
+        return '';
+      }
+
+      const { name, path } = this.lastDeployment.cluster;
+      const escapedName = _.escape(name);
+      const escapedPath = _.escape(path);
+
+      if (!escapedPath) {
+        return escapedName;
+      }
+
+      return sprintf(
+        '%{startLink}%{name}%{endLink}',
+        {
+          startLink: `<a href="${escapedPath}" class="js-job-cluster-link">`,
+          name: escapedName,
+          endLink: '</a>',
+        },
+        false,
+      );
+    },
+    clusterText() {
+      return this.hasCluster
+        ? sprintf(__('Cluster %{cluster} was used.'), { cluster: this.clusterNameOrLink }, false)
+        : '';
+    },
   },
   methods: {
     deploymentLink(name) {

app/assets/javascripts/labels_select.js

@@ -231,7 +231,7 @@ export default class LabelsSelect {
                   });
                 }
                 if (extraData.length) {
-                  extraData.push('divider');
+                  extraData.push({ type: 'divider' });
                   data = extraData.concat(data);
                 }
               }
@@ -243,7 +243,7 @@ export default class LabelsSelect {
             })
             .catch(() => flash(__('Error fetching labels.')));
         },
-        renderRow: function(label, instance) {
+        renderRow: function(label) {
           var linkEl,
             listItemEl,
             color,

app/assets/javascripts/milestone_select.js

@@ -100,7 +100,7 @@ export default class MilestoneSelect {
               });
             }
             if (extraOptions.length) {
-              extraOptions.push('divider');
+              extraOptions.push({ type: 'divider' });
             }
             callback(extraOptions.concat(data));

app/assets/javascripts/namespace_select.js

@@ -34,7 +34,7 @@ export default class NamespaceSelect {
               id: null,
             };
             namespaces.unshift(anyNamespace);
-            namespaces.splice(1, 0, 'divider');
+            namespaces.splice(1, 0, { type: 'divider' });
           }
           return dataCallback(namespaces);
         });

app/assets/javascripts/pages/profiles/two_factor_auths/index.js

@@ -7,7 +7,7 @@ document.addEventListener('DOMContentLoaded', () => {
   const skippable = parseBoolean(twoFactorNode.dataset.twoFactorSkippable);
   if (skippable) {
-    const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
+    const button = `<a class="btn btn-sm btn-warning float-right" data-qa-selector="configure_it_later_button" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
     const flashAlert = document.querySelector('.flash-alert');
     if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
   }

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -215,6 +215,7 @@ export default {
               :disabled="!canChangeVisibilityLevel"
               name="project[visibility_level]"
               class="form-control select-control"
+              data-qa-selector="project_visibility_dropdown"
             >
               <option
                 :value="visibilityOptions.PRIVATE"

app/assets/javascripts/pages/search/show/search.js

@@ -30,7 +30,7 @@ export default class Search {
           data.unshift({
             full_name: __('Any'),
           });
-          data.splice(1, 0, 'divider');
+          data.splice(1, 0, { type: 'divider' });
           return callback(data);
         });
       },
@@ -57,7 +57,7 @@ export default class Search {
             data.unshift({
               name_with_namespace: __('Any'),
             });
-            data.splice(1, 0, 'divider');
+            data.splice(1, 0, { type: 'divider' });
             return data;
           })

app/assets/javascripts/search_autocomplete.js

@@ -191,13 +191,14 @@ export class SearchAutocomplete {
           // Add group header before list each group
           if (lastCategory !== suggestion.category) {
             if (!firstCategory) {
-              data.push('separator');
+              data.push({ type: 'separator' });
             }
             if (firstCategory) {
               firstCategory = false;
             }
             data.push({
-              header: suggestion.category,
+              type: 'header',
+              content: suggestion.category,
             });
             lastCategory = suggestion.category;
           }
@@ -221,7 +222,7 @@ export class SearchAutocomplete {
             template = s__('SearchAutocomplete|in this group');
           }
-          data.unshift('separator');
+          data.unshift({ type: 'separator' });
           data.unshift({
             icon,
             text: term,
@@ -271,7 +272,8 @@ export class SearchAutocomplete {
     if (name) {
       baseItems.push({
-        header: `${name}`,
+        type: 'header',
+        content: `${name}`,
       });
     }

app/assets/javascripts/users_select.js

@@ -333,7 +333,7 @@ function UsersSelect(currentUser, els, options = {}) {
               }
               if (showDivider) {
-                users.splice(showDivider, 0, 'divider');
+                users.splice(showDivider, 0, { type: 'divider' });
               }
               if ($dropdown.hasClass('js-multiselect')) {
@@ -343,7 +343,8 @@ function UsersSelect(currentUser, els, options = {}) {
                   if ($dropdown.data('dropdownHeader')) {
                     showDivider += 1;
                     users.splice(showDivider, 0, {
-                      header: $dropdown.data('dropdownHeader'),
+                      type: 'header',
+                      content: $dropdown.data('dropdownHeader'),
                     });
                   }
@@ -358,7 +359,7 @@ function UsersSelect(currentUser, els, options = {}) {
                     users.splice(showDivider, 0, selectedUser);
                   });
-                  users.splice(showDivider + 1, 0, 'divider');
+                  users.splice(showDivider + 1, 0, { type: 'divider' });
                 }
               }
             }

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -95,7 +95,6 @@ export default {
   },
 };
 </script>
-
 <template>
   <div class="ci-widget media js-ci-widget">
     <template v-if="!hasPipeline || hasCIError">
@@ -157,6 +156,7 @@ export default {
                 </div>
               </template>
             </span>
+
             <linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />
           </span>
         </div>

app/assets/javascripts/vue_shared/components/gl_countdown.vue

@@ -9,6 +9,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+
   props: {
     endDateString: {
       type: String,

app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue

@@ -77,12 +77,11 @@ export default {
 </script>
 <template>
-  <div class="block sidebar-grouped-item">
+  <div class="block sidebar-grouped-item gl-cursor-pointer" role="button" @click="toggleSidebar">
     <collapsed-calendar-icon
       v-if="showMinDateBlock"
       :container-class="iconClass"
       :tooltip-text="tooltipText('min')"
-      @click="toggleSidebar"
     >
       <span class="sidebar-collapsed-value">
         <span v-if="showFromText">{{ __('From') }}</span> <span>{{ dateText('min') }}</span>
@@ -93,7 +92,6 @@ export default {
       v-if="maxDate"
       :container-class="iconClass"
       :tooltip-text="tooltipText('max')"
-      @click="toggleSidebar"
     >
       <span class="sidebar-collapsed-value">
         <span v-if="!minDate">{{ __('Until') }}</span> <span>{{ dateText('max') }}</span>

app/controllers/admin/application_controller.rb

@@ -8,3 +8,5 @@ class Admin::ApplicationController < ApplicationController
   layout 'admin'
 end
+
+Admin::ApplicationController.prepend_if_ee('EE::Admin::ApplicationController')

app/controllers/admin/application_settings_controller.rb

@@ -149,3 +149,5 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     render action
   end
 end
+
+Admin::ApplicationSettingsController.prepend_if_ee('EE::Admin::ApplicationSettingsController')

app/controllers/admin/dashboard_controller.rb

@@ -14,3 +14,5 @@ class Admin::DashboardController < Admin::ApplicationController
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
+
+Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')

app/controllers/admin/groups_controller.rb

@@ -99,3 +99,5 @@ class Admin::GroupsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::GroupsController.prepend_if_ee('EE::Admin::GroupsController')

app/controllers/admin/health_check_controller.rb

@@ -11,3 +11,5 @@ class Admin::HealthCheckController < Admin::ApplicationController
     ['standard']
   end
 end
+
+Admin::HealthCheckController.prepend_if_ee('EE::Admin::HealthCheckController')

app/controllers/admin/logs_controller.rb

@@ -20,3 +20,5 @@ class Admin::LogsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::LogsController.prepend_if_ee('EE::Admin::LogsController')

app/controllers/admin/projects_controller.rb

@@ -76,3 +76,5 @@ class Admin::ProjectsController < Admin::ApplicationController
     @group ||= @project.group
   end
 end
+
+Admin::ProjectsController.prepend_if_ee('EE::Admin::ProjectsController')

app/controllers/admin/users_controller.rb

@@ -241,3 +241,5 @@ class Admin::UsersController < Admin::ApplicationController
     Gitlab::AppLogger.info(_("User %{current_user_username} has started impersonating %{username}") % { current_user_username: current_user.username, username: user.username })
   end
 end
+
+Admin::UsersController.prepend_if_ee('EE::Admin::UsersController')