Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -56,7 +56,6 @@ Style/FrozenStringLiteralComment:
     - 'qa/**/*'
     - 'rubocop/**/*'
     - 'scripts/**/*'
-    - 'spec/lib/gitlab/**/*'
 RSpec/FilePath:
   Exclude:

app/assets/javascripts/diffs/components/app.vue

 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import Icon from '~/vue_shared/components/icon.vue';
 import { __ } from '~/locale';
 import createFlash from '~/flash';
@@ -36,11 +37,20 @@ export default {
     GlLoadingIcon,
     PanelResizer,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     endpoint: {
       type: String,
       required: true,
     },
+    endpointMetadata: {
+      type: String,
+      required: true,
+    },
+    endpointBatch: {
+      type: String,
+      required: true,
+    },
     projectPath: {
       type: String,
       required: true,
@@ -92,6 +102,7 @@ export default {
   computed: {
     ...mapState({
       isLoading: state => state.diffs.isLoading,
+      isBatchLoading: state => state.diffs.isBatchLoading,
       diffFiles: state => state.diffs.diffFiles,
       diffViewType: state => state.diffs.diffViewType,
       mergeRequestDiffs: state => state.diffs.mergeRequestDiffs,
@@ -153,6 +164,8 @@ export default {
   mounted() {
     this.setBaseConfig({
       endpoint: this.endpoint,
+      endpointMetadata: this.endpointMetadata,
+      endpointBatch: this.endpointBatch,
       projectPath: this.projectPath,
       dismissEndpoint: this.dismissEndpoint,
       showSuggestPopover: this.showSuggestPopover,
@@ -185,6 +198,8 @@ export default {
     ...mapActions('diffs', [
       'setBaseConfig',
       'fetchDiffFiles',
+      'fetchDiffFilesMeta',
+      'fetchDiffFilesBatch',
       'startRenderDiffsQueue',
       'assignDiscussionsToDiff',
       'setHighlightedRow',
@@ -196,24 +211,51 @@ export default {
       this.assignedDiscussions = false;
       this.fetchData(false);
     },
+    isLatestVersion() {
+      return window.location.search.indexOf('diff_id') === -1;
+    },
     fetchData(toggleTree = true) {
-      this.fetchDiffFiles()
-        .then(() => {
-          if (toggleTree) {
-            this.hideTreeListIfJustOneFile();
-          }
-          requestIdleCallback(
-            () => {
-              this.setDiscussions();
-              this.startRenderDiffsQueue();
-            },
-            { timeout: 1000 },
-          );
-        })
-        .catch(() => {
-          createFlash(__('Something went wrong on our end. Please try again!'));
-        });
+      if (this.isLatestVersion() && this.glFeatures.diffsBatchLoad) {
+        this.fetchDiffFilesMeta()
+          .then(() => {
+            if (toggleTree) this.hideTreeListIfJustOneFile();
+          })
+          .catch(() => {
+            createFlash(__('Something went wrong on our end. Please try again!'));
+          });
+        this.fetchDiffFilesBatch()
+          .then(() => {
+            requestIdleCallback(
+              () => {
+                this.setDiscussions();
+                this.startRenderDiffsQueue();
+              },
+              { timeout: 1000 },
+            );
+          })
+          .catch(() => {
+            createFlash(__('Something went wrong on our end. Please try again!'));
+          });
+      } else {
+        this.fetchDiffFiles()
+          .then(() => {
+            if (toggleTree) {
+              this.hideTreeListIfJustOneFile();
+            }
+
+            requestIdleCallback(
+              () => {
+                this.setDiscussions();
+                this.startRenderDiffsQueue();
+              },
+              { timeout: 1000 },
+            );
+          })
+          .catch(() => {
+            createFlash(__('Something went wrong on our end. Please try again!'));
+          });
+      }
       if (!this.isNotesFetched) {
         eventHub.$emit('fetchNotesData');
@@ -324,7 +366,8 @@ export default {
           }"
         >
           <commit-widget v-if="commit" :commit="commit" />
-          <template v-if="renderDiffFiles">
+          <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
+          <template v-else-if="renderDiffFiles">
             <diff-file
               v-for="file in diffFiles"
               :key="file.newPath"

app/assets/javascripts/diffs/constants.js

@@ -57,3 +57,4 @@ export const MIN_RENDERING_MS = 2;
 export const START_RENDERING_INDEX = 200;
 export const INLINE_DIFF_LINES_KEY = 'highlighted_diff_lines';
 export const PARALLEL_DIFF_LINES_KEY = 'parallel_diff_lines';
+export const DIFFS_PER_PAGE = 10;

app/assets/javascripts/diffs/index.js

@@ -67,6 +67,8 @@ export default function initDiffsApp(store) {
       return {
         endpoint: dataset.endpoint,
+        endpointMetadata: dataset.endpointMetadata || '',
+        endpointBatch: dataset.endpointBatch || '',
         projectPath: dataset.projectPath,
         helpPagePath: dataset.helpPagePath,
         currentUser: JSON.parse(dataset.currentUserData) || {},
@@ -100,6 +102,8 @@ export default function initDiffsApp(store) {
       return createElement('diffs-app', {
         props: {
           endpoint: this.endpoint,
+          endpointMetadata: this.endpointMetadata,
+          endpointBatch: this.endpointBatch,
           currentUser: this.currentUser,
           projectPath: this.projectPath,
           helpPagePath: this.helpPagePath,

app/assets/javascripts/diffs/store/actions.js

@@ -13,6 +13,7 @@ import {
   convertExpandLines,
   idleCallback,
   allDiscussionWrappersExpanded,
+  prepareDiffData,
 } from './utils';
 import * as types from './mutation_types';
 import {
@@ -33,12 +34,27 @@ import {
   START_RENDERING_INDEX,
   INLINE_DIFF_LINES_KEY,
   PARALLEL_DIFF_LINES_KEY,
+  DIFFS_PER_PAGE,
 } from '../constants';
 import { diffViewerModes } from '~/ide/constants';
 export const setBaseConfig = ({ commit }, options) => {
-  const { endpoint, projectPath, dismissEndpoint, showSuggestPopover } = options;
-  commit(types.SET_BASE_CONFIG, { endpoint, projectPath, dismissEndpoint, showSuggestPopover });
+  const {
+    endpoint,
+    endpointMetadata,
+    endpointBatch,
+    projectPath,
+    dismissEndpoint,
+    showSuggestPopover,
+  } = options;
+  commit(types.SET_BASE_CONFIG, {
+    endpoint,
+    endpointMetadata,
+    endpointBatch,
+    projectPath,
+    dismissEndpoint,
+    showSuggestPopover,
+  });
 };
 export const fetchDiffFiles = ({ state, commit }) => {
@@ -67,6 +83,53 @@ export const fetchDiffFiles = ({ state, commit }) => {
     .catch(() => worker.terminate());
 };
+export const fetchDiffFilesBatch = ({ commit, state }) => {
+  const baseUrl = `${state.endpointBatch}?per_page=${DIFFS_PER_PAGE}`;
+  const url = page => (page ? `${baseUrl}&page=${page}` : baseUrl);
+
+  commit(types.SET_BATCH_LOADING, true);
+
+  const getBatch = page =>
+    axios
+      .get(url(page))
+      .then(({ data: { pagination, diff_files } }) => {
+        commit(types.SET_DIFF_DATA_BATCH, { diff_files });
+        commit(types.SET_BATCH_LOADING, false);
+        return pagination.next_page;
+      })
+      .then(nextPage => nextPage && getBatch(nextPage));
+
+  return getBatch()
+    .then(handleLocationHash)
+    .catch(() => null);
+};
+
+export const fetchDiffFilesMeta = ({ commit, state }) => {
+  const worker = new TreeWorker();
+
+  commit(types.SET_LOADING, true);
+
+  worker.addEventListener('message', ({ data }) => {
+    commit(types.SET_TREE_DATA, data);
+
+    worker.terminate();
+  });
+
+  return axios
+    .get(state.endpointMetadata)
+    .then(({ data }) => {
+      const strippedData = { ...data };
+      strippedData.diff_files = [];
+      commit(types.SET_LOADING, false);
+      commit(types.SET_MERGE_REQUEST_DIFFS, data.merge_request_diffs || []);
+      commit(types.SET_DIFF_DATA, strippedData);
+
+      prepareDiffData(data);
+      worker.postMessage(data.diff_files);
+    })
+    .catch(() => worker.terminate());
+};
+
 export const setHighlightedRow = ({ commit }, lineCode) => {
   const fileHash = lineCode.split('_')[0];
   commit(types.SET_HIGHLIGHTED_ROW, lineCode);

app/assets/javascripts/diffs/store/modules/diff_state.js

@@ -8,6 +8,7 @@ const defaultViewType = INLINE_DIFF_VIEW_TYPE;
 export default () => ({
   isLoading: true,
+  isBatchLoading: false,
   addedLines: null,
   removedLines: null,
   endpoint: '',

app/assets/javascripts/diffs/store/mutation_types.js

 export const SET_BASE_CONFIG = 'SET_BASE_CONFIG';
 export const SET_LOADING = 'SET_LOADING';
+export const SET_BATCH_LOADING = 'SET_BATCH_LOADING';
 export const SET_DIFF_DATA = 'SET_DIFF_DATA';
+export const SET_DIFF_DATA_BATCH = 'SET_DIFF_DATA_BATCH';
 export const SET_DIFF_VIEW_TYPE = 'SET_DIFF_VIEW_TYPE';
 export const SET_MERGE_REQUEST_DIFFS = 'SET_MERGE_REQUEST_DIFFS';
 export const TOGGLE_LINE_HAS_FORM = 'TOGGLE_LINE_HAS_FORM';

app/assets/javascripts/diffs/store/mutations.js

@@ -12,14 +12,32 @@ import * as types from './mutation_types';
 export default {
   [types.SET_BASE_CONFIG](state, options) {
-    const { endpoint, projectPath, dismissEndpoint, showSuggestPopover } = options;
-    Object.assign(state, { endpoint, projectPath, dismissEndpoint, showSuggestPopover });
+    const {
+      endpoint,
+      endpointMetadata,
+      endpointBatch,
+      projectPath,
+      dismissEndpoint,
+      showSuggestPopover,
+    } = options;
+    Object.assign(state, {
+      endpoint,
+      endpointMetadata,
+      endpointBatch,
+      projectPath,
+      dismissEndpoint,
+      showSuggestPopover,
+    });
   },
   [types.SET_LOADING](state, isLoading) {
     Object.assign(state, { isLoading });
   },
+  [types.SET_BATCH_LOADING](state, isBatchLoading) {
+    Object.assign(state, { isBatchLoading });
+  },
+
   [types.SET_DIFF_DATA](state, data) {
     prepareDiffData(data);
@@ -28,6 +46,12 @@ export default {
     });
   },
+  [types.SET_DIFF_DATA_BATCH](state, data) {
+    prepareDiffData(data);
+
+    state.diffFiles.push(...data.diff_files);
+  },
+
   [types.RENDER_FILE](state, file) {
     Object.assign(file, {
       renderIt: true,

app/assets/javascripts/diffs/store/utils.js

@@ -252,10 +252,11 @@ export function prepareDiffData(diffData) {
       showingLines += file.parallel_diff_lines.length;
     }
+    const name = (file.viewer && file.viewer.name) || diffViewerModes.text;
+
     Object.assign(file, {
       renderIt: showingLines < LINES_TO_BE_RENDERED_DIRECTLY,
-      collapsed:
-        file.viewer.name === diffViewerModes.text && showingLines > MAX_LINES_TO_BE_RENDERED,
+      collapsed: name === diffViewerModes.text && showingLines > MAX_LINES_TO_BE_RENDERED,
       isShowingFullFile: false,
       isLoadingFullFile: false,
       discussions: [],

app/assets/javascripts/environments/components/environment_item.vue

@@ -6,6 +6,7 @@ import _ from 'underscore';
 import { GlTooltipDirective } from '@gitlab/ui';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import Icon from '~/vue_shared/components/icon.vue';
+import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
 import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
 import ActionsComponent from './environment_actions.vue';
 import ExternalUrlComponent from './environment_external_url.vue';
@@ -26,7 +27,6 @@ const timeagoInstance = new Timeago();
 export default {
   components: {
-    UserAvatarLink,
     CommitComponent,
     Icon,
     ActionsComponent,
@@ -35,6 +35,8 @@ export default {
     RollbackComponent,
     TerminalButtonComponent,
     MonitoringButtonComponent,
+    TooltipOnTruncate,
+    UserAvatarLink,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -508,12 +510,16 @@ export default {
     </div>
     <div class="table-section section-15 d-none d-sm-none d-md-block" role="gridcell">
-      <a
-        v-if="shouldRenderBuildName"
-        :href="buildPath"
-        class="build-link cgray flex-truncate-parent"
-      >
-        <span class="flex-truncate-child">{{ buildName }}</span>
+      <a v-if="shouldRenderBuildName" :href="buildPath" class="build-link cgray">
+        <tooltip-on-truncate
+          :title="buildName"
+          truncate-target="child"
+          class="flex-truncate-parent"
+        >
+          <span class="flex-truncate-child">
+            {{ buildName }}
+          </span>
+        </tooltip-on-truncate>
       </a>
     </div>

app/assets/javascripts/environments/components/environments_app.vue

@@ -31,10 +31,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    cssContainerClass: {
-      type: String,
-      required: true,
-    },
     newEnvironmentPath: {
       type: String,
       required: true,
@@ -93,7 +89,7 @@ export default {
 };
 </script>
 <template>
-  <div :class="cssContainerClass">
+  <div>
     <stop-environment-modal :environment="environmentInStopModal" />
     <confirm-rollback-modal :environment="environmentInRollbackModal" />

app/assets/javascripts/environments/index.js

@@ -21,7 +21,6 @@ export default () =>
         newEnvironmentPath: environmentsData.newEnvironmentPath,
         helpPagePath: environmentsData.helpPagePath,
         deployBoardsHelpPath: environmentsData.deployBoardsHelpPath,
-        cssContainerClass: environmentsData.cssClass,
         canCreateEnvironment: parseBoolean(environmentsData.canCreateEnvironment),
         canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
       };
@@ -33,7 +32,6 @@ export default () =>
           newEnvironmentPath: this.newEnvironmentPath,
           helpPagePath: this.helpPagePath,
           deployBoardsHelpPath: this.deployBoardsHelpPath,
-          cssContainerClass: this.cssContainerClass,
           canCreateEnvironment: this.canCreateEnvironment,
           canReadEnvironment: this.canReadEnvironment,
           ...this.canaryCalloutProps,

app/controllers/clusters/clusters_controller.rb

@@ -3,14 +3,14 @@
 class Clusters::ClustersController < Clusters::BaseController
   include RoutableActions
-  before_action :cluster, only: [:cluster_status, :show, :update, :destroy]
+  before_action :cluster, only: [:cluster_status, :show, :update, :destroy, :clear_cache]
   before_action :generate_gcp_authorize_url, only: [:new]
   before_action :validate_gcp_token, only: [:new]
   before_action :gcp_cluster, only: [:new]
   before_action :user_cluster, only: [:new]
   before_action :authorize_create_cluster!, only: [:new, :authorize_aws_role, :revoke_aws_role, :aws_proxy]
   before_action :authorize_update_cluster!, only: [:update]
-  before_action :authorize_admin_cluster!, only: [:destroy]
+  before_action :authorize_admin_cluster!, only: [:destroy, :clear_cache]
   before_action :update_applications_status, only: [:cluster_status]
   before_action only: [:new, :create_gcp] do
     push_frontend_feature_flag(:create_eks_clusters)
@@ -169,6 +169,12 @@ class Clusters::ClustersController < Clusters::BaseController
     render json: response.body, status: response.status
   end
+  def clear_cache
+    cluster.delete_cached_resources!
+
+    redirect_to cluster.show_path, notice: _('Cluster cache cleared.')
+  end
+
   private
   def destroy_params

app/models/clusters/cluster.rb

@@ -267,6 +267,10 @@ module Clusters
       end
     end
+    def delete_cached_resources!
+      kubernetes_namespaces.delete_all(:delete_all)
+    end
+
     private
     def unique_management_project_environment_scope

app/presenters/clusterable_presenter.rb

@@ -65,6 +65,10 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
     raise NotImplementedError
   end
+  def clear_cluster_cache_path(cluster)
+    raise NotImplementedError
+  end
+
   def cluster_path(cluster, params = {})
     raise NotImplementedError
   end

app/presenters/group_clusterable_presenter.rb

@@ -19,6 +19,11 @@ class GroupClusterablePresenter < ClusterablePresenter
     update_applications_group_cluster_path(clusterable, cluster, application)
   end
+  override :clear_cluster_cache_path
+  def clear_cluster_cache_path(cluster)
+    clear_cache_group_cluster_path(clusterable, cluster)
+  end
+
   override :cluster_path
   def cluster_path(cluster, params = {})
     group_cluster_path(clusterable, cluster, params)

app/presenters/instance_clusterable_presenter.rb

@@ -37,6 +37,11 @@ class InstanceClusterablePresenter < ClusterablePresenter
     update_applications_admin_cluster_path(cluster, application)
   end
+  override :clear_cluster_cache_path
+  def clear_cluster_cache_path(cluster)
+    clear_cache_admin_cluster_path(cluster)
+  end
+
   override :cluster_path
   def cluster_path(cluster, params = {})
     admin_cluster_path(cluster, params)

app/presenters/project_clusterable_presenter.rb

@@ -19,6 +19,11 @@ class ProjectClusterablePresenter < ClusterablePresenter
     update_applications_project_cluster_path(clusterable, cluster, application)
   end
+  override :clear_cluster_cache_path
+  def clear_cluster_cache_path(cluster)
+    clear_cache_project_cluster_path(clusterable, cluster)
+  end
+
   override :cluster_path
   def cluster_path(cluster, params = {})
     project_cluster_path(clusterable, cluster, params)

app/serializers/diff_file_metadata_entity.rb

@@ -7,4 +7,7 @@ class DiffFileMetadataEntity < Grape::Entity
   expose :old_path
   expose :new_file?, as: :new_file
   expose :deleted_file?, as: :deleted_file
+  expose :file_hash do |diff_file|
+    Digest::SHA1.hexdigest(diff_file.file_path)
+  end
 end

app/views/clusters/clusters/_advanced_settings.html.haml

@@ -28,6 +28,14 @@
     .form-group
       = field.submit _('Save changes'), class: 'btn btn-success qa-save-domain'
+  - if @cluster.managed?
+    .sub-section.form-group
+      %h4
+        = s_('ClusterIntegration|Clear cluster cache')
+      %p
+        = s_("ClusterIntegration|Clear the local cache of namespace and service accounts. This is necessary if your integration has become out of sync. The cache is repopulated during the next CI job that requires namespace and service accounts.")
+      = link_to(s_('ClusterIntegration|Clear cluster cache'), clusterable.clear_cluster_cache_path(@cluster), method: :delete, class: 'btn btn-primary')
+
   .sub-section.form-group
     %h4.text-danger
       = s_('ClusterIntegration|Remove Kubernetes cluster integration')