Automatic merge of gitlab-org/gitlab master

GITALY_SERVER_VERSION

-0697e25f0d30d7d1c005c3fef3130cee001d198c
+bf9abd731ba2dab65e8c275c51d578d95dd3d506

config/feature_flags/development/new_graphql_keyset_pagination.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323730
 milestone: '13.10'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true

doc/administration/geo/replication/datatypes.md

@@ -183,7 +183,7 @@ successfully, you must replicate their data using some other means.
 |[Application data in PostgreSQL](../../postgresql/index.md)                                                    | **Yes** (10.2)                                                          | **Yes** (10.2)                                                          | No                                                                            |       |
 |[Project repository](../../../user/project/repository/)                                                        | **Yes** (10.2)                                                          | **Yes** (10.7)                                                          | No                                                                            |       |
 |[Project wiki repository](../../../user/project/wiki/)                                                         | **Yes** (10.2)                                                          | **Yes** (10.7)                                                          | No                                                                            |       |
-|[Group wiki repository](../../../user/project/wiki/index.md#group-wikis)                                       | [**Yes** (13.10)](https://gitlab.com/gitlab-org/gitlab/-/issues/208147) | No                                                                      | No                                                                            | Behind feature flag `geo_group_wiki_repository_replication`, enabled by default. |
+|[Group wiki repository](../../../user/project/wiki/group.md)                                       | [**Yes** (13.10)](https://gitlab.com/gitlab-org/gitlab/-/issues/208147) | No                                                                      | No                                                                            | Behind feature flag `geo_group_wiki_repository_replication`, enabled by default. |
 |[Uploads](../../uploads.md)                                                                                    | **Yes** (10.2)                                                          | [No](https://gitlab.com/groups/gitlab-org/-/epics/1817)                 | No                                                                            | Verified only on transfer or manually using [Integrity Check Rake Task](../../raketasks/check.md) on both sites and comparing the output between them. |
 |[LFS objects](../../lfs/index.md)                                                                              | **Yes** (10.2)                                                          | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/8922)                | Via Object Storage provider if supported. Native Geo support (Beta).          | Verified only on transfer or manually using [Integrity Check Rake Task](../../raketasks/check.md) on both sites and comparing the output between them. GitLab versions 11.11.x and 12.0.x are affected by [a bug that prevents any new LFS objects from replicating](https://gitlab.com/gitlab-org/gitlab/-/issues/32696).<br /><br />Behind feature flag `geo_lfs_object_replication`, enabled by default. |
 |[Personal snippets](../../../user/snippets.md)                                                                 | **Yes** (10.2)                                                          | **Yes** (10.2)                                                          | No                                                                            |       |

doc/api/group_repository_storage_moves.md

@@ -11,7 +11,7 @@ type: reference
 
 Group repositories can be moved between storages. This API can help you when
 [migrating to Gitaly Cluster](../administration/gitaly/index.md#migrating-to-gitaly-cluster), for
-example, or to migrate a [group wiki](../user/project/wiki/index.md#group-wikis).
+example, or to migrate a [group wiki](../user/project/wiki/group.md).
 
 As group repository storage moves are processed, they transition through different states. Values
 of `state` are:

doc/api/group_wikis.md

@@ -9,7 +9,7 @@ type: reference, api
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/212199) in GitLab 13.5.
 
-The [group wikis](../user/project/wiki/index.md#group-wikis) API is available only in APIv4.
+The [group wikis](../user/project/wiki/group.md) API is available only in APIv4.
 An API for [project wikis](wikis.md) is also available.
 
 ## List wiki pages

doc/development/service_ping/implement.md

@@ -555,13 +555,18 @@ We can also disable tracking completely by using the global flag:
 
 ##### Known events are added automatically in Service Data payload
 
-All events added in [`known_events/common.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/usage_data_counters/known_events/common.yml) are automatically added to Service Data generation under the `redis_hll_counters` key. This column is stored in [version-app as a JSON](https://gitlab.com/gitlab-services/version-gitlab-com/-/blob/master/db/schema.rb#L209).
+Service Ping adds all events [`known_events/*.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/usage_data_counters/known_events) to Service Data generation under the `redis_hll_counters` key. This column is stored in [version-app as a JSON](https://gitlab.com/gitlab-services/version-gitlab-com/-/blob/master/db/schema.rb#L209).
 For each event we add metrics for the weekly and monthly time frames, and totals for each where applicable:
 
 - `#{event_name}_weekly`: Data for 7 days for daily [aggregation](#add-new-events) events and data for the last complete week for weekly [aggregation](#add-new-events) events.
 - `#{event_name}_monthly`: Data for 28 days for daily [aggregation](#add-new-events) events and data for the last 4 complete weeks for weekly [aggregation](#add-new-events) events.
 
-Redis HLL implementation calculates automatic total metrics, if there are more than one metric for the same category, aggregation, and Redis slot.
+Redis HLL implementation calculates total metrics when both of these conditions are met:
+
+- The category is manually included in [CATEGORIES_FOR_TOTALS](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/usage_data_counters/hll_redis_counter.rb#L21).
+- There is more than one metric for the same category, aggregation, and Redis slot.
+
+We add total unique counts for the weekly and monthly time frames where applicable:
 
 - `#{category}_total_unique_counts_weekly`: Total unique counts for events in the same category for the last 7 days or the last complete week, if events are in the same Redis slot and we have more than one metric.
 - `#{category}_total_unique_counts_monthly`: Total unique counts for events in same category for the last 28 days or the last 4 complete weeks, if events are in the same Redis slot and we have more than one metric.

doc/raketasks/backup_restore.md

@@ -61,7 +61,7 @@ including:
 - Container Registry images
 - GitLab Pages content
 - Snippets
-- [Group wikis](../user/project/wiki/index.md#group-wikis)
+- [Group wikis](../user/project/wiki/group.md)
 
 Backups do not include:
 

doc/topics/git/lfs/index.md

@@ -42,6 +42,7 @@ Documentation for GitLab instance administrators is under [LFS administration do
   credentials store is recommended.
 - Git LFS always assumes HTTPS so if you have GitLab server on HTTP you must
   [add the URL to Git configuration manually](#troubleshooting).
+- [Group wikis](../../../user/project/wiki/group.md) do not support Git LFS.
 
 NOTE:
 With 8.12 GitLab added LFS support to SSH. The Git LFS communication

doc/user/group/index.md

@@ -266,6 +266,8 @@ These Group Activity Analytics can be enabled with the `group_activity_analytics
 
 ![Recent Group Activity](img/group_activity_analytics_v13_10.png)
 
+Changes to [group wikis](../project/wiki/group.md) do not appear in group activity analytics.
+
 ### View group activity
 
 You can view the most recent actions taken in a group, either in your browser or in an RSS feed:

doc/user/group/settings/import_export.md

@@ -40,7 +40,7 @@ be imported into the desired group structure.
 - To preserve the member list and their respective permissions on imported groups, review the users in these groups. Make
 sure these users exist before importing the desired groups.
 
-### Exported Contents
+### Exported contents
 
 The following items are exported:
 
@@ -51,7 +51,7 @@ The following items are exported:
 - Subgroups (including all the aforementioned data)
 - Epics
 - Events
-- [Wikis](../../project/wiki/index.md#group-wikis) **(PREMIUM SELF)**
+- [Wikis](../../project/wiki/group.md) **(PREMIUM SELF)**
   (Introduced in [GitLab 13.9](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53247))
 
 The following items are **not** exported:

doc/user/project/wiki/group.md

+---
+stage: Create
+group: Editor
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
+type: reference, how-to
+---
+
+# Group wikis **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13195) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.5.
+
+If you use GitLab groups to manage multiple projects, some of your documentation
+might span multiple groups. You can create group wikis, instead of [project wikis](index.md),
+to ensure all group members have the correct access permissions to contribute.
+Group wikis are similar to [project wikis](index.md), with a few limitations:
+
+- [Git LFS](../../../topics/git/lfs/index.md) is not supported.
+- Group wikis are not included in [global search](../../search/advanced_search.md).
+- Changes to group wikis don't show up in the [group's activity feed](../../group/index.md#group-activity-analytics).
+- Group wikis are enabled by default for **(PREMIUM)** and higher tiers.
+  You [can't turn them off from the GitLab user interface](https://gitlab.com/gitlab-org/gitlab/-/issues/208413).
+
+For updates, follow [the epic that tracks feature parity with project wikis](https://gitlab.com/groups/gitlab-org/-/epics/2782).
+
+Similar to project wikis, group members with the [Developer role](../../permissions.md#group-members-permissions)
+and higher can edit group wikis. Group wiki repositories can be moved using the
+[Group repository storage moves API](../../../api/group_repository_storage_moves.md).
+
+## View a group wiki
+
+To access a group wiki:
+
+1. On the top bar, select **Menu > Groups** and find your group.
+1. To display the wiki, either:
+   - On the left sidebar, select **Wiki**.
+   - On any page in the project, use the <kbd>g</kbd> + <kbd>w</kbd>
+     [wiki keyboard shortcut](../../shortcuts.md).
+
+## Export a group wiki
+
+> Introduced in [GitLab 13.9](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53247).
+
+Users with the [Owner role](../../permissions.md) in a group can
+[import and export group wikis](../../group/settings/import_export.md) when importing
+or exporting a group.
+
+Content created in a group wiki is not deleted when an account is downgraded or a GitLab trial ends.
+
+## Related topics
+
+- [Wiki settings for administrators](../../../administration/wikis/index.md)
+- [Project wikis API](../../../api/wikis.md)
+- [Group repository storage moves API](../../../api/group_repository_storage_moves.md)
+- [Group wikis API](../../../api/group_wikis.md)
+- [Wiki keyboard shortcuts](../../shortcuts.md#wiki-pages)
+- [Epic: Feature parity with project wikis](https://gitlab.com/groups/gitlab-org/-/epics/2782)

doc/user/search/advanced_search.md

@@ -26,7 +26,7 @@ when searching in:
 - Comments
 - Code
 - Commits
-- Wiki
+- Wiki (except [group wikis](../project/wiki/group.md))
 - Users
 
 The Advanced Search can be useful in various scenarios:
@@ -139,4 +139,4 @@ its performance:
 | Commits | `global_search_commits_tab` | When enabled, the global search includes commits as part of the search. |
 | Issues | `global_search_issues_tab` | When enabled, the global search includes issues as part of the search. |
 | Merge Requests | `global_search_merge_requests_tab` | When enabled, the global search includes merge requests as part of the search. |
-| Wiki | `global_search_wiki_tab` | When enabled, the global search includes wiki as part of the search. |
+| Wiki | `global_search_wiki_tab` | When enabled, the global search includes wiki as part of the search. [Group wikis](../project/wiki/group.md) are not included. |

doc/user/snippets.md

@@ -132,7 +132,7 @@ A single snippet can support up to 10 files, which helps keep related files toge
 
 If you need more than 10 files for your snippet, we recommend you create a
 [wiki](project/wiki/index.md) instead. Wikis are available for projects at all
-subscription levels, and [groups](project/wiki/index.md#group-wikis) for
+subscription levels, and [groups](project/wiki/group.md) for
 [GitLab Premium](https://about.gitlab.com/pricing/).
 
 Snippets with multiple files display a file count in the [snippet list](https://gitlab.com/dashboard/snippets):

ee/app/assets/javascripts/boards/components/board_scope.vue

@@ -69,6 +69,11 @@ export default {
     expandButtonText() {
       return this.expanded ? __('Collapse') : __('Expand');
     },
+    scopeText() {
+      return this.isIssueBoard
+        ? __('Board scope affects which issues are displayed for anyone who visits this board')
+        : __('Board scope affects which epics are displayed for anyone who visits this board');
+    },
   },
 
   methods: {
@@ -92,7 +97,7 @@ export default {
       </button>
     </div>
     <p class="text-secondary gl-mb-3">
-      {{ __('Board scope affects which issues are displayed for anyone who visits this board') }}
+      {{ scopeText }}
     </p>
     <div v-if="!collapseScope || expanded">
       <board-milestone-select

ee/spec/frontend/boards/components/board_scope_spec.js

@@ -11,16 +11,17 @@ describe('BoardScope', () => {
   let wrapper;
   let store;
 
-  const createStore = () => {
+  const createStore = ({ isIssueBoard }) => {
     return new Vuex.Store({
       getters: {
-        isIssueBoard: () => true,
-        isEpicBoard: () => false,
+        isIssueBoard: () => isIssueBoard,
+        isEpicBoard: () => !isIssueBoard,
       },
     });
   };
 
-  function mountComponent() {
+  function mountComponent({ isIssueBoard = true } = []) {
+    store = createStore({ isIssueBoard });
     wrapper = mount(BoardScope, {
       store,
       propsData: {
@@ -41,7 +42,6 @@ describe('BoardScope', () => {
   }
 
   beforeEach(() => {
-    store = createStore();
     mountComponent();
   });
 
@@ -51,7 +51,7 @@ describe('BoardScope', () => {
 
   const findLabelSelect = () => wrapper.findComponent(LabelsSelect);
 
-  describe('ee/app/assets/javascripts/boards/components/board_scope.vue', () => {
+  describe('BoardScope', () => {
     it('emits selected labels to be added and removed from the board', async () => {
       const labels = [{ id: '1', set: true, color: '#BADA55', text_color: '#FFFFFF' }];
       expect(findLabelSelect().exists()).toBe(true);
@@ -62,4 +62,13 @@ describe('BoardScope', () => {
       expect(wrapper.emitted('set-board-labels')).toEqual([[labels]]);
     });
   });
+
+  it.each`
+    isIssueBoard | text
+    ${true}      | ${'Board scope affects which issues are displayed for anyone who visits this board'}
+    ${false}     | ${'Board scope affects which epics are displayed for anyone who visits this board'}
+  `('displays $text when isIssueBoard is $isIssueBoard', ({ isIssueBoard, text }) => {
+    mountComponent({ isIssueBoard });
+    expect(wrapper.find('p.text-secondary').text()).toEqual(text);
+  });
 });

lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb

@@ -76,7 +76,7 @@ module Gitlab
 
           def items
             original_items = super
-            return original_items if Gitlab::Pagination::Keyset::Order.keyset_aware?(original_items) || Feature.disabled?(:new_graphql_keyset_pagination)
+            return original_items if Feature.disabled?(:new_graphql_keyset_pagination, default_enabled: :yaml) || Gitlab::Pagination::Keyset::Order.keyset_aware?(original_items)
 
             strong_memoize(:generic_keyset_pagination_items) do
               rebuilt_items_with_keyset_order, success = Gitlab::Pagination::Keyset::SimpleOrderBuilder.build(original_items)

locale/gitlab.pot

@@ -5431,6 +5431,9 @@ msgstr ""
 msgid "Blog"
 msgstr ""
 
+msgid "Board scope affects which epics are displayed for anyone who visits this board"
+msgstr ""
+
 msgid "Board scope affects which issues are displayed for anyone who visits this board"
 msgstr ""