Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/jira_import/components/jira_import_form.vue

@@ -168,10 +168,12 @@ export default {
         })
         .then(({ data }) => {
           this.users =
-            data?.project?.projectMembers?.nodes?.map(({ user }) => ({
-              ...user,
-              id: getIdFromGraphQLId(user.id),
-            })) || [];
+            data?.project?.projectMembers?.nodes
+              .filter((x) => x?.user)
+              .map(({ user }) => ({
+                ...user,
+                id: getIdFromGraphQLId(user.id),
+              })) || [];
           return this.users;
         })
         .finally(() => {

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

@@ -26,14 +26,7 @@ const isValidDateString = (dateString) => {
     return false;
   }
 
-  try {
-    // dateformat throws error that can be caught.
-    // This is better than using `new Date()`
-    dateformat(dateString, 'isoUtcDateTime');
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return !Number.isNaN(Date.parse(dateformat(dateString, 'isoUtcDateTime')));
 };
 
 const handleRangeDirection = ({ direction = DEFAULT_DIRECTION, anchorDate, minDate, maxDate }) => {

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

@@ -106,7 +106,7 @@ export function formatDateAsMonth(datetime, options = {}) {
 
 /**
  * @example
- * dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am GMT+0000"
+ * dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am UTC"
  * @param {date} datetime
  * @param {String} format
  * @param {Boolean} UTC convert local time to UTC

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

@@ -113,7 +113,7 @@ export default {
       update(data) {
         // TODO Remove null filter (BE fix required)
         // https://gitlab.com/gitlab-org/gitlab/-/issues/329750
-        return data.workspace?.users?.nodes.filter((x) => x).map(({ user }) => user) || [];
+        return data.workspace?.users?.nodes.filter((x) => x?.user).map(({ user }) => user) || [];
       },
       debounce: ASSIGNEES_DEBOUNCE_DELAY,
       error({ graphQLErrors }) {

app/views/shared/issuable/_search_bar.html.haml

@@ -23,7 +23,7 @@
             - checkbox_id = 'check-all-issues'
             %label.gl-sr-only{ for: checkbox_id }= _('Select all')
             = check_box_tag checkbox_id, nil, false, class: "check-all-issues left"
-        - if Feature.enabled?(:boards_filtered_search, @group) && is_epic_board
+        - if is_epic_board
           #js-board-filtered-search{ data: { full_path: @group&.full_path } }
         - else
           .issues-other-filters.filtered-search-wrapper.d-flex.flex-column.flex-md-row

config/feature_flags/development/boards_filtered_search.yml

@@ -11,6 +11,9 @@
 
   # This needs to be executed after fork of clustered processes
   Gitlab::Cluster::LifecycleEvents.on_worker_start do
+    # For Host-based LB, we need to re-connect as Rails discards connections on fork
+    Gitlab::Database::LoadBalancing.configure_proxy
+
     # Service discovery must be started after configuring the proxy, as service
     # discovery depends on this.
     Gitlab::Database::LoadBalancing.start_service_discovery

config/initializers/load_balancing.rb

@@ -52,6 +52,7 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
     - 'i_code_review_click_single_file_mode_setting'
     - 'i_code_review_click_file_browser_setting'
     - 'i_code_review_click_whitespace_setting'
@@ -109,6 +110,7 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_diff_view_setting'
     - 'i_code_review_click_single_file_mode_setting'
     - 'i_code_review_click_file_browser_setting'
     - 'i_code_review_click_whitespace_setting'

config/metrics/aggregates/code_review.yml

@@ -1,6 +1,6 @@
 ---
 key_path: counts_monthly.personal_snippets
-description: Monthly count of Personal Snippets
+description: Monthly count of personal Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216180308_personal_snippets.yml

@@ -1,6 +1,6 @@
 ---
 key_path: counts_monthly.project_snippets
-description: Monthly count of Project Snippets
+description: Monthly count of project Snippets
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216180310_project_snippets.yml

@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216180312_snippets.yml

@@ -1,19 +1,19 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.snippets
-description: Monthly Snippets
+name: count_distinct_author_id_from_snippets
+description: Count of distinct author_id from snippets for last 28 days 
 product_section: dev
 product_stage: create
 product_group: group::editor
 product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216180317_snippets.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
-description: Count unique edit actions using the web IDE
+description: Number of users editing using web IDE 
 product_section: dev
 product_stage: create
 product_group: group::editor
 product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit
-description: Count unique edit actions using the single file editor
+description: Number of users using single file editor
 product_section: dev
 product_stage: create
 product_group: group::editor
 product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit
-description: Count unique edit actions using the snippet editor
+description: Number of users using the snippet editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category: web_ide
+product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
-description: Count unique edit actions using the static site editor
+description: Number of users using the static site editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category: web_ide
+product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
-description: Count unique edit actions when users used an IDE, no matter which one
+description: Number of unique users per month who edited a file from any web editor
 product_section: dev
 product_stage: create
 product_group: group::editor
 product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml

@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
-description:
+description: Number of users editing a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml

@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
-description:
+description: Number of users editing a file from the single file editor
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml

@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
-description:
+description: Count of monthly edits to a snippet
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: snippets
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml

@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
-description:
+description: Count of unique users per month who edited a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
-product_category:
+product_category: web_ide
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml

@@ -1,16 +1,18 @@
 ---
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
-description:
+description: Unique monthly active users of the Wiki
 product_section: dev
 product_stage: create
-product_group: group::knowledge
+product_group: group::editor
 product_category: wiki
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml

@@ -1,16 +1,18 @@
 ---
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of user editing files using the Static Site Editor
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: static_site_editor
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate