app/assets/javascripts/groups/members/constants.js

 export const GROUP_MEMBER_BASE_PROPERTY_NAME = 'group_member';
-export const GROUP_MEMBER_ACCESS_LEVEL_PROPERTY_NAME = 'access_level';
-
-export const GROUP_LINK_BASE_PROPERTY_NAME = 'group_link';
-export const GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME = 'group_access';

app/assets/javascripts/groups/members/utils.js

-import { isUndefined } from 'lodash';
-import { convertObjectPropsToCamelCase, parseBoolean } from '~/lib/utils/common_utils';
-import {
-  GROUP_MEMBER_BASE_PROPERTY_NAME,
-  GROUP_MEMBER_ACCESS_LEVEL_PROPERTY_NAME,
-  GROUP_LINK_BASE_PROPERTY_NAME,
-  GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
-} from './constants';
-
-export const parseDataAttributes = (el) => {
-  const { members, groupId, memberPath, canManageMembers } = el.dataset;
-
-  return {
-    members: convertObjectPropsToCamelCase(JSON.parse(members), { deep: true }),
-    sourceId: parseInt(groupId, 10),
-    memberPath,
-    canManageMembers: parseBoolean(canManageMembers),
-  };
-};
-
-const baseRequestFormatter = (basePropertyName, accessLevelPropertyName) => ({
-  accessLevel,
-  ...otherProperties
-}) => {
-  const accessLevelProperty = !isUndefined(accessLevel)
-    ? { [accessLevelPropertyName]: accessLevel }
-    : {};
+import { baseRequestFormatter } from '~/members/utils';
+import { MEMBER_ACCESS_LEVEL_PROPERTY_NAME } from '~/members/constants';
+import { GROUP_MEMBER_BASE_PROPERTY_NAME } from './constants';
 
-  return {
-    [basePropertyName]: {
-      ...accessLevelProperty,
-      ...otherProperties,
-    },
-  };
-};
-
-export const memberRequestFormatter = baseRequestFormatter(
+export const groupMemberRequestFormatter = baseRequestFormatter(
   GROUP_MEMBER_BASE_PROPERTY_NAME,
-  GROUP_MEMBER_ACCESS_LEVEL_PROPERTY_NAME,
-);
-
-export const groupLinkRequestFormatter = baseRequestFormatter(
-  GROUP_LINK_BASE_PROPERTY_NAME,
-  GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
+  MEMBER_ACCESS_LEVEL_PROPERTY_NAME,
 );

app/assets/javascripts/groups/members/components/app.vue → app/assets/javascripts/members/components/app.vue

 <script>
 import { mapState, mapMutations } from 'vuex';
 import { GlAlert } from '@gitlab/ui';
-import MembersTable from '~/members/components/table/members_table.vue';
-import FilterSortContainer from '~/members/components/filter_sort/filter_sort_container.vue';
+import MembersTable from './table/members_table.vue';
+import FilterSortContainer from './filter_sort/filter_sort_container.vue';
+import { HIDE_ERROR } from '../store/mutation_types';
 import { scrollToElement } from '~/lib/utils/common_utils';
-import { HIDE_ERROR } from '~/members/store/mutation_types';
 
 export default {
-  name: 'GroupMembersApp',
+  name: 'MembersApp',
   components: { MembersTable, FilterSortContainer, GlAlert },
   computed: {
     ...mapState(['showError', 'errorMessage']),

app/assets/javascripts/members/constants.js

@@ -98,3 +98,8 @@ export const REMOVE_GROUP_LINK_MODAL_ID = 'remove-group-link-modal-id';
 export const SEARCH_TOKEN_TYPE = 'filtered-search-term';
 
 export const SORT_PARAM = 'sort';
+
+export const MEMBER_ACCESS_LEVEL_PROPERTY_NAME = 'access_level';
+
+export const GROUP_LINK_BASE_PROPERTY_NAME = 'group_link';
+export const GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME = 'group_access';

app/assets/javascripts/groups/members/index.js → app/assets/javascripts/members/index.js

 import Vue from 'vue';
 import Vuex from 'vuex';
 import { GlToast } from '@gitlab/ui';
-import { parseDataAttributes } from 'ee_else_ce/groups/members/utils';
+import { parseDataAttributes } from 'ee_else_ce/members/utils';
 import App from './components/app.vue';
-import membersStore from '~/members/store';
+import membersStore from './store';
 
-export const initGroupMembersApp = (
+export const initMembersApp = (
   el,
   {
     tableFields = [],

app/assets/javascripts/members/utils.js

+import { isUndefined } from 'lodash';
 import { __ } from '~/locale';
-import { getParameterByName } from '~/lib/utils/common_utils';
+import {
+  getParameterByName,
+  convertObjectPropsToCamelCase,
+  parseBoolean,
+} from '~/lib/utils/common_utils';
 import { setUrlParams } from '~/lib/utils/url_utility';
-import { FIELDS, DEFAULT_SORT } from './constants';
+import {
+  FIELDS,
+  DEFAULT_SORT,
+  GROUP_LINK_BASE_PROPERTY_NAME,
+  GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
+} from './constants';
 
 export const generateBadges = (member, isCurrentUser) => [
   {
@@ -95,3 +105,35 @@ export const buildSortHref = ({
 
 // Defined in `ee/app/assets/javascripts/vue_shared/components/members/utils.js`
 export const canOverride = () => false;
+
+export const parseDataAttributes = (el) => {
+  const { members, sourceId, memberPath, canManageMembers } = el.dataset;
+
+  return {
+    members: convertObjectPropsToCamelCase(JSON.parse(members), { deep: true }),
+    sourceId: parseInt(sourceId, 10),
+    memberPath,
+    canManageMembers: parseBoolean(canManageMembers),
+  };
+};
+
+export const baseRequestFormatter = (basePropertyName, accessLevelPropertyName) => ({
+  accessLevel,
+  ...otherProperties
+}) => {
+  const accessLevelProperty = !isUndefined(accessLevel)
+    ? { [accessLevelPropertyName]: accessLevel }
+    : {};
+
+  return {
+    [basePropertyName]: {
+      ...accessLevelProperty,
+      ...otherProperties,
+    },
+  };
+};
+
+export const groupLinkRequestFormatter = baseRequestFormatter(
+  GROUP_LINK_BASE_PROPERTY_NAME,
+  GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
+);

app/assets/javascripts/pages/groups/group_members/index.js

@@ -3,10 +3,11 @@ import memberExpirationDate from '~/member_expiration_date';
 import UsersSelect from '~/users_select';
 import groupsSelect from '~/groups_select';
 import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue';
-import { initGroupMembersApp } from '~/groups/members';
 import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
 import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
-import { memberRequestFormatter, groupLinkRequestFormatter } from '~/groups/members/utils';
+import { initMembersApp } from '~/members/index';
+import { groupMemberRequestFormatter } from '~/groups/members/utils';
+import { groupLinkRequestFormatter } from '~/members/utils';
 import { s__ } from '~/locale';
 
 function mountRemoveMemberModal() {
@@ -25,11 +26,11 @@ function mountRemoveMemberModal() {
 
 const SHARED_FIELDS = ['account', 'expires', 'maxRole', 'expiration', 'actions'];
 
-initGroupMembersApp(document.querySelector('.js-group-members-list'), {
+initMembersApp(document.querySelector('.js-group-members-list'), {
   tableFields: SHARED_FIELDS.concat(['source', 'granted']),
   tableAttrs: { tr: { 'data-qa-selector': 'member_row' } },
   tableSortableFields: ['account', 'granted', 'maxRole', 'lastSignIn'],
-  requestFormatter: memberRequestFormatter,
+  requestFormatter: groupMemberRequestFormatter,
   filteredSearchBar: {
     show: true,
     tokens: ['two_factor', 'with_inherited_permissions'],
@@ -38,7 +39,8 @@ initGroupMembersApp(document.querySelector('.js-group-members-list'), {
     recentSearchesStorageKey: 'group_members',
   },
 });
-initGroupMembersApp(document.querySelector('.js-group-linked-list'), {
+
+initMembersApp(document.querySelector('.js-group-group-links-list'), {
   tableFields: SHARED_FIELDS.concat('granted'),
   tableAttrs: {
     table: { 'data-qa-selector': 'groups_list' },
@@ -46,9 +48,9 @@ initGroupMembersApp(document.querySelector('.js-group-linked-list'), {
   },
   requestFormatter: groupLinkRequestFormatter,
 });
-initGroupMembersApp(document.querySelector('.js-group-invited-members-list'), {
+initMembersApp(document.querySelector('.js-group-invited-members-list'), {
   tableFields: SHARED_FIELDS.concat('invited'),
-  requestFormatter: memberRequestFormatter,
+  requestFormatter: groupMemberRequestFormatter,
   filteredSearchBar: {
     show: true,
     tokens: [],
@@ -57,9 +59,9 @@ initGroupMembersApp(document.querySelector('.js-group-invited-members-list'), {
     recentSearchesStorageKey: 'group_invited_members',
   },
 });
-initGroupMembersApp(document.querySelector('.js-group-access-requests-list'), {
+initMembersApp(document.querySelector('.js-group-access-requests-list'), {
   tableFields: SHARED_FIELDS.concat('requested'),
-  requestFormatter: memberRequestFormatter,
+  requestFormatter: groupMemberRequestFormatter,
 });
 
 groupsSelect();

app/assets/javascripts/performance_bar/performance_bar_log.js

@@ -43,7 +43,7 @@ const logUserTimingMetrics = () => {
 const initPerformanceBarLog = () => {
   console.log(
     `%c ${String.fromCodePoint(0x1f98a)} GitLab performance bar`,
-    'width:100%;background-color: #292961; color: #FFFFFF; font-size:24px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto; padding: 10px;display:block;padding-right: 100px;',
+    'width:100%; background-color: #292961; color: #FFFFFF; padding: 10px; display:block;',
   );
 
   initVitalsLog();

app/controllers/whats_new_controller.rb

@@ -5,7 +5,6 @@ class WhatsNewController < ApplicationController
 
   skip_before_action :authenticate_user!
 
-  before_action :check_feature_flag
   before_action :check_valid_page_param, :set_pagination_headers, unless: -> { has_version_param? }
 
   feature_category :navigation
@@ -20,10 +19,6 @@ def index
 
   private
 
-  def check_feature_flag
-    render_404 unless Feature.enabled?(:whats_new_drawer, current_user)
-  end
-
   def check_valid_page_param
     render_404 if current_page < 1
   end

app/helpers/groups/group_members_helper.rb

@@ -13,7 +13,7 @@ def render_invite_member_for_group(group, default_access_level)
     render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: group.access_level_roles, default_access_level: default_access_level
   end
 
-  def linked_groups_data_json(group_links)
+  def group_group_links_data_json(group_links)
     GroupGroupLinkSerializer.new.represent(group_links, { current_user: current_user }).to_json
   end
 
@@ -26,16 +26,16 @@ def group_members_list_data_attributes(group, members)
     {
       members: members_data_json(group, members),
       member_path: group_group_member_path(group, ':id'),
-      group_id: group.id,
+      source_id: group.id,
       can_manage_members: can?(current_user, :admin_group_member, group).to_s
     }
   end
 
-  def linked_groups_list_data_attributes(group)
+  def group_group_links_list_data_attributes(group)
     {
-      members: linked_groups_data_json(group.shared_with_group_links),
+      members: group_group_links_data_json(group.shared_with_group_links),
       member_path: group_group_link_path(group, ':id'),
-      group_id: group.id
+      source_id: group.id
     }
   end
 end

app/views/groups/group_members/index.html.haml

@@ -66,7 +66,7 @@
         = paginate @members, theme: 'gitlab', params: { invited_members_page: nil, search_invited: nil }
       - if @group.shared_with_group_links.any?
         #tab-groups.tab-pane
-          .js-group-linked-list{ data: linked_groups_list_data_attributes(@group) }
+          .js-group-group-links-list{ data: group_group_links_list_data_attributes(@group) }
             .loading
               .spinner.spinner-md
       - if show_invited_members

app/views/layouts/header/_default.html.haml

@@ -120,8 +120,7 @@
         = sprite_icon('ellipsis_h', size: 12, css_class: 'more-icon js-navbar-toggle-right')
         = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')
 
-- if ::Feature.enabled?(:whats_new_drawer, current_user)
-  #whats-new-app{ data: { storage_key: whats_new_storage_key, versions: whats_new_versions, gitlab_dot_com: Gitlab.dev_env_org_or_com? } }
+#whats-new-app{ data: { storage_key: whats_new_storage_key, versions: whats_new_versions, gitlab_dot_com: Gitlab.dev_env_org_or_com? } }
 
 - if can?(current_user, :update_user_status, current_user)
   .js-set-status-modal-wrapper{ data: user_status_data }

app/views/layouts/header/_help_dropdown.html.haml

 %ul
   - if current_user_menu?(:help)
-    = render_if_exists 'layouts/header/whats_new_dropdown_item'
+    = render 'layouts/header/whats_new_dropdown_item'
     %li
       = link_to _("Help"), help_path
     %li

app/views/layouts/header/_whats_new_dropdown_item.html.haml

+%li
+  %button.gl-justify-content-space-between.gl-align-items-center.js-whats-new-trigger{ type: 'button', data: { storage_key: whats_new_storage_key }, class: 'gl-display-flex!' }
+    = _("What's new")
+    %span.js-whats-new-notification-count.whats-new-notification-count
+      = whats_new_most_recent_release_items_count

changelogs/unreleased/229174_use_unix_time_for_jira_update_sequence_id.yml

+---
+title: Change Jira Connect update sequence id to use Unix Time
+merge_request: 51697
+author:
+type: fixed

changelogs/unreleased/jswain_whats_new_remove_feature_flag.yml

+---
+title: Add "What's new" item to the help dropdown
+merge_request: 52020
+author:
+type: changed

doc/development/feature_flags/development.md

@@ -321,6 +321,28 @@ Feature.enabled?(:feature_flag, group)
 Feature.enabled?(:feature_flag, user)
 ```
 
+#### Selectively disable by actor
+
+By default you cannot selectively disable a feature flag by actor.
+
+```shell
+# This will not work how you would expect.
+/chatops run feature set some_feature true
+/chatops run feature set --project=gitlab-org/gitlab some_feature false
+```
+
+However, if you add two feature flags, you can write your conditional statement in such a way that the equivalent selective disable is possible.
+
+```ruby
+Feature.enabled?(:a_feature, project) && Feature.disabled?(:a_feature_override, project)
+```
+
+```shell
+# This will enable a feature flag globally, except for gitlab-org/gitlab
+/chatops run feature set a_feature true
+/chatops run feature set --project=gitlab-org/gitlab a_feature_override true
+```
+
 ### Enable additional objects as actors
 
 To use feature gates based on actors, the model needs to respond to

ee/app/assets/javascripts/groups/members/utils.js

-import { parseDataAttributes as CEParseDataAttributes } from '~/groups/members/utils';
-
-export const parseDataAttributes = (el) => {
-  const { ldapOverridePath } = el.dataset;
-
-  return {
-    ...CEParseDataAttributes(el),
-    ldapOverridePath,
-  };
-};

ee/app/assets/javascripts/members/utils.js

 import { __ } from '~/locale';
-import { generateBadges as CEGenerateBadges } from '~/members/utils';
+import {
+  generateBadges as CEGenerateBadges,
+  parseDataAttributes as CEParseDataAttributes,
+} from '~/members/utils';
 
 export {
   isGroup,
@@ -35,3 +38,12 @@ export const generateBadges = (member, isCurrentUser) => [
 ];
 
 export const canOverride = (member) => member.canOverride;
+
+export const parseDataAttributes = (el) => {
+  const { ldapOverridePath } = el.dataset;
+
+  return {
+    ...CEParseDataAttributes(el),
+    ldapOverridePath,
+  };
+};

ee/app/controllers/registrations/groups_controller.rb

@@ -27,6 +27,10 @@ def create
       if helpers.in_trial_onboarding_flow?
         render_new && return unless apply_trial
 
+        record_experiment_user(:remove_known_trial_form_fields, namespace_id: @group.id)
+        record_experiment_user(:trimmed_skip_trial_copy, namespace_id: @group.id)
+        record_experiment_user(:trial_registration_with_social_signin, namespace_id: @group.id)
+
         url_params[:trial_onboarding_flow] = true
       else
         record_experiment_user(:trial_during_signup, trial_chosen: trial, namespace_id: @group.id)