.eslintrc.yml

@@ -48,3 +48,4 @@ overrides:
       - '**/spec/**/*'
     rules:
       "@gitlab/require-i18n-strings": off
+      "@gitlab/no-runtime-template-compiler": off

.gitlab/CODEOWNERS

@@ -257,3 +257,18 @@ Dangerfile @gl-quality/eng-prod
 /lib/gitlab/usage_data.rb @gitlab-org/growth/product_intelligence/engineers
 /lib/gitlab/cycle_analytics/usage_data.rb @gitlab-org/growth/product-intelligence/engineers
 /lib/gitlab/usage_data_counters/ @gitlab-org/growth/product-intelligence/engineers
+
+[Growth Experiments]
+/app/assets/javascripts/lib/utils/experimentation.js @gitlab-org/growth/experiment-devs
+/app/experiments/ @gitlab-org/growth/experiment-devs
+/app/models/experiment.rb @gitlab-org/growth/experiment-devs
+/app/models/experiment_subject.rb @gitlab-org/growth/experiment-devs
+/app/models/experiment_user.rb @gitlab-org/growth/experiment-devs
+/app/workers/experiments/ @gitlab-org/growth/experiment-devs
+/config/feature_flags/experiment/ @gitlab-org/growth/experiment-devs
+/ee/config/feature_flags/experiment/ @gitlab-org/growth/experiment-devs
+/ee/lib/api/experiments.rb @gitlab-org/growth/experiment-devs
+/ee/lib/ee/api/entities/experiment.rb @gitlab-org/growth/experiment-devs
+/lib/gitlab/experimentation/ @gitlab-org/growth/experiment-devs
+/lib/gitlab/experimentation.rb @gitlab-org/growth/experiment-devs
+/lib/gitlab/experimentation_logger.rb @gitlab-org/growth/experiment-devs

.gitlab/ci/global.gitlab-ci.yml

@@ -75,7 +75,7 @@
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:4.0-alpine
+    - name: redis:5.0-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
 
@@ -84,7 +84,7 @@
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:4.0-alpine
+    - name: redis:5.0-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
 
@@ -93,7 +93,7 @@
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:4.0-alpine
+    - name: redis:5.0-alpine
     - name: elasticsearch:7.9.2
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:
@@ -104,7 +104,7 @@
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:4.0-alpine
+    - name: redis:5.0-alpine
     - name: elasticsearch:7.9.2
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:

.gitlab/ci/rails.gitlab-ci.yml

@@ -376,6 +376,17 @@ db:rollback:
     - bundle exec rake db:migrate VERSION=20181228175414
     - bundle exec rake db:migrate SKIP_SCHEMA_VERSION_CHECK=true
 
+db:gitlabcom-database-testing:
+  extends: .rails:rules:db:gitlabcom-database-testing
+  stage: test
+  image: ruby:2.7-alpine
+  needs: []
+  allow_failure: true
+  script:
+    - source scripts/utils.sh
+    - install_gitlab_gem
+    - ./scripts/trigger-build gitlab-com-database-testing
+
 gitlab:setup:
   extends: .db-job-base
   variables:

.gitlab/ci/rules.gitlab-ci.yml

@@ -523,6 +523,13 @@
       changes: *db-patterns
     - <<: *if-merge-request-title-run-all-rspec
 
+.rails:rules:db:gitlabcom-database-testing:
+  rules:
+    - if: '$GITLABCOM_DATABASE_TESTING_TRIGGER_TOKEN == null'
+      when: never
+    - <<: *if-merge-request
+      changes: *db-patterns
+
 .rails:rules:ee-and-foss-unit:
   rules:
     - changes: *backend-patterns

.gitpod.yml

@@ -13,7 +13,10 @@ tasks:
       (
         set -e
         cd /workspace/gitlab-development-kit
-        [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
+        # GitLab FOSS
+        [[ -d /workspace/gitlab-foss ]] && ln -fs /workspace/gitlab-foss /workspace/gitlab-development-kit/gitlab
+        # GitLab
+        [[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
         mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
         # reconfigure GDK
         echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
@@ -21,7 +24,6 @@ tasks:
         # run DB migrations
         echo "$(date) – Running DB migrations" | tee -a /workspace/startup.log
         make gitlab-db-migrate
-        cd -
         # stop GDK
         echo "$(date) – Stopping GDK" | tee -a /workspace/startup.log
         gdk stop
@@ -47,9 +49,11 @@ tasks:
         if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then
           make gitlab-db-migrate
         fi
-        cd ../gitlab
+        cd /workspace/gitlab-development-kit/gitlab
+        # Install Lefthook
+        bundle exec lefthook install
         git checkout db/structure.sql
-        cd ../gitlab-development-kit
+        cd /workspace/gitlab-development-kit
         # Waiting for GitLab ...
         gp await-port 3000
         printf "Waiting for GitLab at $(gp url 3000) ..."

.rubocop_manual_todo.yml

@@ -31,38 +31,6 @@ FactoryBot/InlineAssociation:
 
 InternalAffairs/DeprecateCopHelper:
   Exclude:
-    - 'spec/rubocop/cop/group_public_or_visible_to_user_spec.rb'
-    - 'spec/rubocop/cop/static_translation_definition_spec.rb'
-    - 'spec/rubocop/cop/lint/last_keyword_argument_spec.rb'
-    - 'spec/rubocop/cop/usage_data/large_table_spec.rb'
-    - 'spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb'
-    - 'spec/rubocop/cop/filename_length_spec.rb'
-    - 'spec/rubocop/cop/put_project_routes_under_scope_spec.rb'
-    - 'spec/rubocop/cop/gitlab/rails_logger_spec.rb'
-    - 'spec/rubocop/cop/gitlab/module_with_instance_variables_spec.rb'
-    - 'spec/rubocop/cop/gitlab/avoid_uploaded_file_from_params_spec.rb'
-    - 'spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb'
-    - 'spec/rubocop/cop/gitlab/bulk_insert_spec.rb'
-    - 'spec/rubocop/cop/gitlab/intersect_spec.rb'
-    - 'spec/rubocop/cop/gitlab/json_spec.rb'
-    - 'spec/rubocop/cop/gitlab/httparty_spec.rb'
-    - 'spec/rubocop/cop/gitlab/policy_rule_boolean_spec.rb'
-    - 'spec/rubocop/cop/gitlab/except_spec.rb'
-    - 'spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb'
-    - 'spec/rubocop/cop/gitlab/change_timezone_spec.rb'
-    - 'spec/rubocop/cop/gitlab/predicate_memoization_spec.rb'
-    - 'spec/rubocop/cop/gitlab/union_spec.rb'
-    - 'spec/rubocop/cop/gitlab/finder_with_find_by_spec.rb'
-    - 'spec/rubocop/cop/ruby_interpolation_in_translation_spec.rb'
-    - 'spec/rubocop/cop/active_record_association_reload_spec.rb'
-    - 'spec/rubocop/cop/ban_catch_throw_spec.rb'
-    - 'spec/rubocop/cop/avoid_break_from_strong_memoize_spec.rb'
-    - 'spec/rubocop/cop/avoid_becomes_spec.rb'
-    - 'spec/rubocop/cop/qa/ambiguous_page_object_name_spec.rb'
-    - 'spec/rubocop/cop/qa/element_with_pattern_spec.rb'
-    - 'spec/rubocop/cop/inject_enterprise_edition_module_spec.rb'
-    - 'spec/rubocop/cop/avoid_keyword_arguments_in_sidekiq_workers_spec.rb'
-    - 'spec/rubocop/cop/default_scope_spec.rb'
     - 'spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb'
     - 'spec/rubocop/cop/scalability/idempotent_worker_spec.rb'
     - 'spec/rubocop/cop/scalability/cron_worker_context_spec.rb'
@@ -2205,7 +2173,7 @@ Gitlab/NamespacedClass:
     - 'app/validators/system_hook_url_validator.rb'
     - 'app/validators/top_level_group_validator.rb'
     - 'app/validators/untrusted_regexp_validator.rb'
-    - 'app/validators/variable_duplicates_validator.rb'
+    - 'app/validators/nested_attributes_duplicates_validator.rb'
     - 'app/validators/x509_certificate_credentials_validator.rb'
     - 'app/validators/zoom_url_validator.rb'
     - 'app/workers/admin_email_worker.rb'

.rubocop_todo.yml

@@ -155,20 +155,6 @@ Lint/BinaryOperatorWithIdenticalOperands:
 Lint/ConstantDefinitionInBlock:
   Enabled: false
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Lint/DeprecatedOpenSSLConstant:
-  Exclude:
-    - 'app/services/clusters/kubernetes/configure_istio_ingress_service.rb'
-    - 'ee/lib/gitlab/geo/oauth/logout_state.rb'
-    - 'lib/gitlab/conan_token.rb'
-    - 'lib/gitlab/gitaly_client.rb'
-    - 'lib/gitlab/kubernetes/helm/v2/certificate.rb'
-    - 'spec/lib/gitlab/conan_token_spec.rb'
-    - 'spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb'
-    - 'spec/support/helpers/smime_helper.rb'
-    - 'spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb'
-
 # Offense count: 1
 Lint/DuplicateRequire:
   Exclude:

Dangerfile

@@ -3,10 +3,7 @@
 require_relative 'tooling/gitlab_danger'
 require_relative 'tooling/danger/request_helper'
 
-danger.import_plugin('danger/plugins/helper.rb')
-danger.import_plugin('danger/plugins/roulette.rb')
-danger.import_plugin('danger/plugins/changelog.rb')
-danger.import_plugin('danger/plugins/sidekiq_queues.rb')
+Dir["danger/plugins/*.rb"].sort.each { |f| danger.import_plugin(f) }
 
 return if helper.release_automation?
 

GITALY_SERVER_VERSION

-99f78e4d93d8c9ec23ef710ffde0fb4b75d786bb
+b3a047a5626ff654ad998dd7a94c6a51624f54b4

app/assets/javascripts/admin/statistics_panel/components/app.vue

@@ -26,8 +26,8 @@ export default {
 </script>
 
 <template>
-  <div class="info-well">
-    <div class="well-segment admin-well admin-well-statistics">
+  <div class="gl-card">
+    <div class="gl-card-body">
       <h4>{{ __('Statistics') }}</h4>
       <gl-loading-icon v-if="isLoading" size="md" class="my-3" />
       <template v-else>

app/assets/javascripts/admin/users/index.js

 import Vue from 'vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import UsagePingDisabled from './components/usage_ping_disabled.vue';
 import AdminUsersApp from './components/app.vue';
 
-export default function (el = document.querySelector('#js-admin-users-app')) {
+export const initAdminUsersApp = (el = document.querySelector('#js-admin-users-app')) => {
   if (!el) {
     return false;
   }
@@ -19,4 +20,24 @@ export default function (el = document.querySelector('#js-admin-users-app')) {
         },
       }),
   });
-}
+};
+
+export const initCohortsEmptyState = (el = document.querySelector('#js-cohorts-empty-state')) => {
+  if (!el) {
+    return false;
+  }
+
+  const { emptyStateSvgPath, enableUsagePingLink, docsLink } = el.dataset;
+
+  return new Vue({
+    el,
+    provide: {
+      svgPath: emptyStateSvgPath,
+      primaryButtonPath: enableUsagePingLink,
+      docsLink,
+    },
+    render(h) {
+      return h(UsagePingDisabled);
+    },
+  });
+};

app/assets/javascripts/admin/users/tabs.js

+import { historyPushState } from '~/lib/utils/common_utils';
+import { mergeUrlParams } from '~/lib/utils/url_utility';
+
+const COHORTS_PANE = 'cohorts';
+
+const tabClickHandler = (e) => {
+  const { hash } = e.currentTarget;
+  const tab = hash === `#${COHORTS_PANE}` ? COHORTS_PANE : null;
+  const newUrl = mergeUrlParams({ tab }, window.location.href);
+  historyPushState(newUrl);
+};
+
+const initTabs = () => {
+  const tabLinks = document.querySelectorAll('.js-users-tab-item a');
+
+  if (tabLinks.length) {
+    tabLinks.forEach((tabLink) => {
+      tabLink.addEventListener('click', (e) => tabClickHandler(e));
+    });
+  }
+};
+
+export default initTabs;

app/assets/javascripts/api.js

@@ -442,10 +442,11 @@ const Api = {
     });
   },
 
-  applySuggestion(id, message) {
+  applySuggestion(id, message = '') {
     const url = Api.buildUrl(Api.applySuggestionPath).replace(':id', encodeURIComponent(id));
+    const params = gon.features?.suggestionsCustomCommit ? { commit_message: message } : false;
 
-    return axios.put(url, { commit_message: message });
+    return axios.put(url, params);
   },
 
   applySuggestionBatch(ids) {

app/assets/javascripts/batch_comments/components/draft_note.vue

@@ -79,7 +79,6 @@ export default {
 </script>
 <template>
   <article
-    role="article"
     class="draft-note-component note-wrapper"
     @mouseenter="handleMouseEnter(draft)"
     @mouseleave="handleMouseLeave(draft)"

app/assets/javascripts/behaviors/shortcuts/keybindings.js

@@ -29,6 +29,7 @@ export const customizations = parsedCustomizations;
 
 // All available commands
 export const TOGGLE_PERFORMANCE_BAR = 'globalShortcuts.togglePerformanceBar';
+export const TOGGLE_CANARY = 'globalShortcuts.toggleCanary';
 
 /** All keybindings, grouped and ordered with descriptions */
 export const keybindingGroups = [
@@ -42,6 +43,12 @@ export const keybindingGroups = [
         // eslint-disable-next-line @gitlab/require-i18n-strings
         defaultKeys: ['p b'],
       },
+      {
+        description: s__('KeyboardShortcuts|Toggle GitLab Next'),
+        command: TOGGLE_CANARY,
+        // eslint-disable-next-line @gitlab/require-i18n-strings
+        defaultKeys: ['g x'],
+      },
     ],
   },
 ]

app/assets/javascripts/behaviors/shortcuts/shortcuts.js

@@ -9,7 +9,7 @@ import axios from '../../lib/utils/axios_utils';
 import { refreshCurrentPage, visitUrl } from '../../lib/utils/url_utility';
 import findAndFollowLink from '../../lib/utils/navigation_utility';
 import { parseBoolean, getCspNonceValue } from '~/lib/utils/common_utils';
-import { keysFor, TOGGLE_PERFORMANCE_BAR } from './keybindings';
+import { keysFor, TOGGLE_PERFORMANCE_BAR, TOGGLE_CANARY } from './keybindings';
 
 const defaultStopCallback = Mousetrap.prototype.stopCallback;
 Mousetrap.prototype.stopCallback = function customStopCallback(e, element, combo) {
@@ -72,6 +72,7 @@ export default class Shortcuts {
     Mousetrap.bind('/', Shortcuts.focusSearch);
     Mousetrap.bind('f', this.focusFilter.bind(this));
     Mousetrap.bind(keysFor(TOGGLE_PERFORMANCE_BAR), Shortcuts.onTogglePerfBar);
+    Mousetrap.bind(keysFor(TOGGLE_CANARY), Shortcuts.onToggleCanary);
 
     const findFileURL = document.body.dataset.findFile;
 
@@ -124,6 +125,14 @@ export default class Shortcuts {
     refreshCurrentPage();
   }
 
+  static onToggleCanary(e) {
+    e.preventDefault();
+    const canaryCookieName = 'gitlab_canary';
+    const currentValue = parseBoolean(Cookies.get(canaryCookieName));
+    Cookies.set(canaryCookieName, (!currentValue).toString(), { expires: 365, path: '/' });
+    refreshCurrentPage();
+  }
+
   static toggleMarkdownPreview(e) {
     // Check if short-cut was triggered while in Write Mode
     const $target = $(e.target);

app/assets/javascripts/boards/components/board_sidebar.js

-/* eslint-disable no-new */
+// This is a true violation of @gitlab/no-runtime-template-compiler, as it
+// relies on app/views/shared/boards/components/_sidebar.html.haml for its
+// template.
+/* eslint-disable no-new, @gitlab/no-runtime-template-compiler */
 
 import $ from 'jquery';
 import Vue from 'vue';

app/assets/javascripts/boards/components/toggle_focus.vue

+<script>
+import { GlIcon } from '@gitlab/ui';
+import { __ } from '~/locale';
+import { hide } from '~/tooltips';
+
+export default {
+  components: {
+    GlIcon,
+  },
+  props: {
+    issueBoardsContentSelector: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+    };
+  },
+  methods: {
+    toggleFocusMode() {
+      hide(this.$refs.toggleFocusModeButton);
+
+      const issueBoardsContent = document.querySelector(this.issueBoardsContentSelector);
+      issueBoardsContent.classList.toggle('is-focused');
+
+      this.isFullscreen = !this.isFullscreen;
+    },
+  },
+  i18n: {
+    toggleFocusMode: __('Toggle focus mode'),
+  },
+};
+</script>
+
+<template>
+  <div class="board-extra-actions">
+    <a
+      ref="toggleFocusModeButton"
+      href="#"
+      class="btn btn-default has-tooltip gl-ml-3 js-focus-mode-btn"
+      data-qa-selector="focus_mode_button"
+      role="button"
+      :aria-label="$options.i18n.toggleFocusMode"
+      :title="$options.i18n.toggleFocusMode"
+      @click="toggleFocusMode"
+    >
+      <gl-icon :name="isFullscreen ? 'minimize' : 'maximize'" />
+    </a>
+  </div>
+</template>