.rubocop.yml

@@ -13,8 +13,6 @@ inherit_from:
     <% end %>
   - '.rubocop_todo.yml'
   <% end %>
-  <%# See https://gitlab.com/gitlab-org/gitlab/-/issues/321982#rubymine-note for context on why namespaced_class has special handling here %>
-  - ./.rubocop_todo/gitlab/namespaced_class.yml
   - ./rubocop/rubocop-migrations.yml
   - ./rubocop/rubocop-usage-data.yml
   - ./rubocop/rubocop-code_reuse.yml

app/assets/javascripts/analytics/devops_reports/components/devops_score.vue

@@ -40,7 +40,7 @@ export default {
       return this.devopsScoreMetrics.averageScore === undefined;
     },
   },
-  devopsReportDocsPath: helpPagePath('user/admin_area/analytics/dev_ops_report'),
+  devopsReportDocsPath: helpPagePath('user/admin_area/analytics/dev_ops_reports'),
   tableHeaderFields: [
     {
       key: 'title',

app/assets/javascripts/ci_secure_files/components/secure_files_list.vue

@@ -17,6 +17,7 @@ import Api, { DEFAULT_PER_PAGE } from '~/api';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import httpStatusCodes from '~/lib/utils/http_status';
 import { __, s__, sprintf } from '~/locale';
+import Tracking from '~/tracking';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 
 export default {
@@ -36,6 +37,7 @@ export default {
     GlTooltip: GlTooltipDirective,
     GlModal: GlModalDirective,
   },
+  mixins: [Tracking.mixin()],
   inject: ['projectId', 'admin', 'fileSizeLimit'],
   docsLink: helpPagePath('ci/secure_files/index'),
   DEFAULT_PER_PAGE,
@@ -113,6 +115,8 @@ export default {
       try {
         await Api.deleteProjectSecureFile(this.projectId, secureFileId);
         this.getProjectSecureFiles();
+
+        this.track('delete_secure_file');
       } catch (error) {
         Sentry.captureException(error);
         this.error = true;
@@ -129,6 +133,7 @@ export default {
 
       this.loading = false;
       this.uploading = false;
+      this.track('render_secure_files_list');
     },
     async uploadSecureFile() {
       this.error = null;
@@ -137,6 +142,7 @@ export default {
       try {
         await Api.uploadProjectSecureFile(this.projectId, this.uploadFormData(file));
         this.getProjectSecureFiles();
+        this.track('upload_secure_file');
       } catch (error) {
         this.error = true;
         this.errorMessage = this.formattedErrorMessage(error);

app/assets/javascripts/issues/list/constants.js

@@ -90,6 +90,8 @@ export const UPDATED_ASC = 'UPDATED_ASC';
 export const UPDATED_DESC = 'UPDATED_DESC';
 export const WEIGHT_ASC = 'WEIGHT_ASC';
 export const WEIGHT_DESC = 'WEIGHT_DESC';
+export const CLOSED_ASC = 'CLOSED_AT_ASC';
+export const CLOSED_DESC = 'CLOSED_AT_DESC';
 
 export const urlSortParams = {
   [PRIORITY_ASC]: 'priority',
@@ -98,6 +100,8 @@ export const urlSortParams = {
   [CREATED_DESC]: 'created_date',
   [UPDATED_ASC]: 'updated_asc',
   [UPDATED_DESC]: 'updated_desc',
+  [CLOSED_ASC]: 'closed_asc',
+  [CLOSED_DESC]: 'closed_desc',
   [MILESTONE_DUE_ASC]: 'milestone',
   [MILESTONE_DUE_DESC]: 'milestone_due_desc',
   [DUE_DATE_ASC]: 'due_date',

app/assets/javascripts/issues/list/queries/issue.fragment.graphql

@@ -13,6 +13,7 @@ fragment IssueFragment on Issue {
   state
   title
   updatedAt
+  closedAt
   upvotes
   userDiscussionsCount @include(if: $isSignedIn)
   webPath

app/assets/javascripts/issues/list/utils.js

@@ -44,6 +44,8 @@ import {
   urlSortParams,
   WEIGHT_ASC,
   WEIGHT_DESC,
+  CLOSED_ASC,
+  CLOSED_DESC,
 } from './constants';
 
 export const getInitialPageParams = (
@@ -92,6 +94,14 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
     },
     {
       id: 4,
+      title: __('Closed date'),
+      sortDirection: {
+        ascending: CLOSED_ASC,
+        descending: CLOSED_DESC,
+      },
+    },
+    {
+      id: 5,
       title: __('Milestone due date'),
       sortDirection: {
         ascending: MILESTONE_DUE_ASC,
@@ -99,7 +109,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       },
     },
     {
-      id: 5,
+      id: 6,
       title: __('Due date'),
       sortDirection: {
         ascending: DUE_DATE_ASC,
@@ -107,7 +117,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       },
     },
     {
-      id: 6,
+      id: 7,
       title: __('Popularity'),
       sortDirection: {
         ascending: POPULARITY_ASC,
@@ -115,7 +125,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       },
     },
     {
-      id: 7,
+      id: 8,
       title: __('Label priority'),
       sortDirection: {
         ascending: LABEL_PRIORITY_ASC,
@@ -123,7 +133,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       },
     },
     {
-      id: 8,
+      id: 9,
       title: __('Manual'),
       sortDirection: {
         ascending: RELATIVE_POSITION_ASC,
@@ -131,7 +141,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       },
     },
     {
-      id: 9,
+      id: 10,
       title: __('Title'),
       sortDirection: {
         ascending: TITLE_ASC,

app/assets/javascripts/notes/components/noteable_note.vue

 <script>
-import { GlSprintf, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
+import { GlSprintf, GlSafeHtmlDirective as SafeHtml, GlAvatarLink, GlAvatar } from '@gitlab/ui';
 import $ from 'jquery';
 import { escape, isEmpty } from 'lodash';
 import { mapGetters, mapActions } from 'vuex';
@@ -11,7 +11,6 @@ import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending';
 import { truncateSha } from '~/lib/utils/text_utility';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
 import { __, s__, sprintf } from '~/locale';
-import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import eventHub from '../event_hub';
 import noteable from '../mixins/noteable';
 import resolvable from '../mixins/resolvable';
@@ -31,11 +30,12 @@ export default {
   name: 'NoteableNote',
   components: {
     GlSprintf,
-    userAvatarLink,
     noteHeader,
     noteActions,
     NoteBody,
     TimelineEntryItem,
+    GlAvatarLink,
+    GlAvatar,
   },
   directives: {
     SafeHtml,
@@ -196,13 +196,11 @@ export default {
 
       return fileResolvedFromAvailableSource || null;
     },
-    avatarSize() {
-      // Use a different size if shown on a Merge Request Diff
-      if (this.line && !this.isOverviewTab) {
-        return 24;
-      }
-
-      return 40;
+    isMRDiffView() {
+      return this.line && !this.isOverviewTab;
+    },
+    authorAvatarAdaptiveSize() {
+      return { default: 24, md: 32 };
     },
   },
   created() {
@@ -428,19 +426,33 @@ export default {
         </template>
       </gl-sprintf>
     </div>
-    <div class="timeline-icon">
-      <user-avatar-link
-        :link-href="author.path"
-        :img-src="author.avatar_url"
-        :img-alt="author.name"
-        :img-size="avatarSize"
-        lazy
-      >
-        <template #avatar-badge>
-          <slot name="avatar-badge"></slot>
-        </template>
-      </user-avatar-link>
+
+    <div v-if="isMRDiffView" class="gl-float-left gl-mt-n1 gl-mr-3">
+      <gl-avatar-link :href="author.path">
+        <gl-avatar
+          :src="author.avatar_url"
+          :entity-name="author.username"
+          :alt="author.name"
+          :size="24"
+        />
+
+        <slot name="avatar-badge"></slot>
+      </gl-avatar-link>
+    </div>
+
+    <div v-else class="gl-float-left gl-pl-3 gl-mr-3 gl-md-pl-2 gl-md-pr-2">
+      <gl-avatar-link :href="author.path">
+        <gl-avatar
+          :src="author.avatar_url"
+          :entity-name="author.username"
+          :alt="author.name"
+          :size="authorAvatarAdaptiveSize"
+        />
+
+        <slot name="avatar-badge"></slot>
+      </gl-avatar-link>
     </div>
+
     <div class="timeline-content">
       <div class="note-header">
         <note-header

app/assets/javascripts/notes/constants.js

@@ -10,8 +10,8 @@ export const OPENED = 'opened';
 export const REOPENED = 'reopened';
 export const CLOSED = 'closed';
 export const MERGED = 'merged';
-export const ISSUE_NOTEABLE_TYPE = 'issue';
-export const EPIC_NOTEABLE_TYPE = 'epic';
+export const ISSUE_NOTEABLE_TYPE = 'Issue';
+export const EPIC_NOTEABLE_TYPE = 'Epic';
 export const MERGE_REQUEST_NOTEABLE_TYPE = 'MergeRequest';
 export const UNRESOLVE_NOTE_METHOD_NAME = 'delete';
 export const RESOLVE_NOTE_METHOD_NAME = 'post';

app/assets/javascripts/notes/stores/actions.js

@@ -83,14 +83,17 @@ export const setExpandDiscussions = ({ commit }, { discussionIds, expanded }) =>
   commit(types.SET_EXPAND_DISCUSSIONS, { discussionIds, expanded });
 };
 
-export const fetchDiscussions = ({ commit, dispatch }, { path, filter, persistFilter }) => {
+export const fetchDiscussions = (
+  { commit, dispatch, getters },
+  { path, filter, persistFilter },
+) => {
   const config =
     filter !== undefined
       ? { params: { notes_filter: filter, persist_filter: persistFilter } }
       : null;
 
   if (
-    window.gon?.features?.paginatedIssueDiscussions ||
+    getters.noteableType === constants.ISSUE_NOTEABLE_TYPE ||
     window.gon?.features?.paginatedMrDiscussions
   ) {
     return dispatch('fetchDiscussionsBatch', { path, config, perPage: 20 });
@@ -114,7 +117,7 @@ export const fetchDiscussionsBatch = ({ commit, dispatch }, { path, config, curs
   return axios.get(path, { params }).then(({ data, headers }) => {
     commit(types.ADD_OR_UPDATE_DISCUSSIONS, data);
 
-    if (headers['x-next-page-cursor']) {
+    if (headers && headers['x-next-page-cursor']) {
       const nextConfig = { ...config };
 
       if (config?.params?.persist_filter) {

app/assets/javascripts/packages_and_registries/settings/group/components/duplicates_settings.vue

 <script>
-import { GlSprintf, GlToggle, GlFormGroup, GlFormInput } from '@gitlab/ui';
+import { GlToggle, GlFormGroup, GlFormInput } from '@gitlab/ui';
 import { isEqual } from 'lodash';
 
 import {
   DUPLICATES_TOGGLE_LABEL,
-  DUPLICATES_ALLOWED_DISABLED,
-  DUPLICATES_ALLOWED_ENABLED,
   DUPLICATES_SETTING_EXCEPTION_TITLE,
   DUPLICATES_SETTINGS_EXCEPTION_LEGEND,
 } from '~/packages_and_registries/settings/group/constants';
@@ -18,7 +16,6 @@ export default {
     DUPLICATES_SETTINGS_EXCEPTION_LEGEND,
   },
   components: {
-    GlSprintf,
     GlToggle,
     GlFormGroup,
     GlFormInput,
@@ -63,9 +60,6 @@ export default {
     },
   },
   computed: {
-    enabledButtonLabel() {
-      return this.duplicatesAllowed ? DUPLICATES_ALLOWED_ENABLED : DUPLICATES_ALLOWED_DISABLED;
-    },
     isExceptionRegexValid() {
       return !this.duplicateExceptionRegexError;
     },
@@ -80,41 +74,30 @@ export default {
 
 <template>
   <form>
-    <div class="gl-display-flex">
-      <gl-toggle
-        :data-qa-selector="toggleQaSelector"
-        :label="$options.i18n.DUPLICATES_TOGGLE_LABEL"
-        label-position="hidden"
-        :value="duplicatesAllowed"
+    <gl-toggle
+      :data-qa-selector="toggleQaSelector"
+      :label="$options.i18n.DUPLICATES_TOGGLE_LABEL"
+      :value="duplicatesAllowed"
+      :disabled="loading"
+      @change="update(modelNames.allowed, $event)"
+    />
+    <gl-form-group
+      v-if="!duplicatesAllowed"
+      class="gl-mt-4"
+      :label="$options.i18n.DUPLICATES_SETTING_EXCEPTION_TITLE"
+      label-size="sm"
+      :state="isExceptionRegexValid"
+      :invalid-feedback="duplicateExceptionRegexError"
+      :description="$options.i18n.DUPLICATES_SETTINGS_EXCEPTION_LEGEND"
+      label-for="maven-duplicated-settings-regex-input"
+    >
+      <gl-form-input
+        id="maven-duplicated-settings-regex-input"
         :disabled="loading"
-        @change="update(modelNames.allowed, $event)"
+        size="lg"
+        :value="duplicateExceptionRegex"
+        @change="update(modelNames.exception, $event)"
       />
-      <div class="gl-ml-5">
-        <div data-testid="toggle-label" :data-qa-selector="labelQaSelector">
-          <gl-sprintf :message="enabledButtonLabel">
-            <template #bold="{ content }">
-              <strong>{{ content }}</strong>
-            </template>
-          </gl-sprintf>
-        </div>
-        <gl-form-group
-          v-if="!duplicatesAllowed"
-          class="gl-mt-4"
-          :label="$options.i18n.DUPLICATES_SETTING_EXCEPTION_TITLE"
-          label-size="sm"
-          :state="isExceptionRegexValid"
-          :invalid-feedback="duplicateExceptionRegexError"
-          :description="$options.i18n.DUPLICATES_SETTINGS_EXCEPTION_LEGEND"
-          label-for="maven-duplicated-settings-regex-input"
-        >
-          <gl-form-input
-            id="maven-duplicated-settings-regex-input"
-            :disabled="loading"
-            :value="duplicateExceptionRegex"
-            @change="update(modelNames.exception, $event)"
-          />
-        </gl-form-group>
-      </div>
-    </div>
+    </gl-form-group>
   </form>
 </template>

app/assets/javascripts/packages_and_registries/settings/group/components/packages_settings.vue

 <script>
-import { GlSprintf, GlLink } from '@gitlab/ui';
 import DuplicatesSettings from '~/packages_and_registries/settings/group/components/duplicates_settings.vue';
 import GenericSettings from '~/packages_and_registries/settings/group/components/generic_settings.vue';
 import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue';
 import {
   PACKAGE_SETTINGS_HEADER,
   PACKAGE_SETTINGS_DESCRIPTION,
-  PACKAGES_DOCS_PATH,
 } from '~/packages_and_registries/settings/group/constants';
 import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql';
 import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update';
@@ -19,12 +17,7 @@ export default {
     PACKAGE_SETTINGS_HEADER,
     PACKAGE_SETTINGS_DESCRIPTION,
   },
-  links: {
-    PACKAGES_DOCS_PATH,
-  },
   components: {
-    GlSprintf,
-    GlLink,
     SettingsBlock,
     MavenSettings,
     GenericSettings,
@@ -98,13 +91,7 @@ export default {
     <template #title> {{ $options.i18n.PACKAGE_SETTINGS_HEADER }}</template>
     <template #description>
       <span data-testid="description">
-        <gl-sprintf :message="$options.i18n.PACKAGE_SETTINGS_DESCRIPTION">
-          <template #link="{ content }">
-            <gl-link :href="$options.links.PACKAGES_DOCS_PATH" target="_blank">{{
-              content
-            }}</gl-link>
-          </template>
-        </gl-sprintf>
+        {{ $options.i18n.PACKAGE_SETTINGS_DESCRIPTION }}
       </span>
     </template>
     <template #default>

app/assets/javascripts/packages_and_registries/settings/group/constants.js

 import { helpPagePath } from '~/helpers/help_page_helper';
 import { s__, __ } from '~/locale';
 
-export const PACKAGE_SETTINGS_HEADER = s__('PackageRegistry|Package Registry');
+export const PACKAGE_SETTINGS_HEADER = s__('PackageRegistry|Duplicate packages');
 export const PACKAGE_SETTINGS_DESCRIPTION = s__(
-  'PackageRegistry|Use GitLab as a private registry for common package formats. %{linkStart}Learn more.%{linkEnd}',
+  'PackageRegistry|Allow packages with the same name and version to be uploaded to the registry. The newest version of a package is always used when installing.',
 );
 
-export const DUPLICATES_TOGGLE_LABEL = s__('PackageRegistry|Allow duplicates');
-export const DUPLICATES_ALLOWED_DISABLED = s__(
-  'PackageRegistry|%{boldStart}Do not allow duplicates%{boldEnd} - Reject packages with the same name and version.',
-);
-export const DUPLICATES_ALLOWED_ENABLED = s__(
-  'PackageRegistry|%{boldStart}Allow duplicates%{boldEnd} - Accept packages with the same name and version.',
+export const DUPLICATES_TOGGLE_LABEL = s__(
+  'PackageRegistry|Reject packages with the same name and version',
 );
 export const DUPLICATES_SETTING_EXCEPTION_TITLE = __('Exceptions');
 export const DUPLICATES_SETTINGS_EXCEPTION_LEGEND = s__(

app/assets/javascripts/projects/commit_box/info/init_details_button.js

-import $ from 'jquery';
-
 export const initDetailsButton = () => {
-  $('body').on('click', '.js-details-expand', function expand(e) {
+  document.querySelector('.commit-info').addEventListener('click', function expand(e) {
     e.preventDefault();
-    $(this).next('.js-details-content').removeClass('hide');
-    $(this).hide();
+    this.querySelector('.js-details-content').classList.remove('hide');
+    this.querySelector('.js-details-expand').classList.add('gl-display-none');
   });
 };

app/assets/javascripts/users_select/index.js

@@ -249,7 +249,7 @@ function UsersSelect(currentUser, els, options = {}) {
       )} <% } %>`,
     );
     assigneeTemplate = template(
-      `<% if (username) { %> <a class="author-link bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself">
+      `<% if (username) { %> <a class="author-link gl-font-weight-bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself">
       ${sprintf(s__('UsersSelect|No assignee - %{openingTag} assign yourself %{closingTag}'), {
         openingTag: '<a href="#" class="js-assign-yourself">',
         closingTag: '</a>',
@@ -585,7 +585,7 @@ function UsersSelect(currentUser, els, options = {}) {
           )}</a></li>`;
         } else {
           // 0 margin, because it's now handled by a wrapper
-          img = `<img src='${avatar}' class='avatar avatar-inline m-0' width='32' />`;
+          img = `<img src='${avatar}' class='avatar avatar-inline gl-m-0!' width='32' />`;
         }
 
         return userSelect.renderRow(
@@ -806,9 +806,9 @@ UsersSelect.prototype.renderRow = function (
       : user.name;
   return `
     <li data-user-id=${user.id}>
-      <a href="#" class="dropdown-menu-user-link d-flex align-items-center ${linkClasses}" ${tooltipAttributes}>
+      <a href="#" class="dropdown-menu-user-link gl-display-flex! gl-align-items-center ${linkClasses}" ${tooltipAttributes}>
         ${this.renderRowAvatar(issuableType, user, img)}
-        <span class="d-flex flex-column overflow-hidden">
+        <span class="gl-display-flex gl-flex-direction-column gl-overflow-hidden">
           <strong class="dropdown-menu-user-full-name gl-font-weight-bold">
             ${escape(name)}
           </strong>
@@ -836,7 +836,7 @@ UsersSelect.prototype.renderRowAvatar = function (issuableType, user, img) {
       ? spriteIcon('warning-solid', 's12 merge-icon')
       : '';
 
-  return `<span class="position-relative mr-2">
+  return `<span class="gl-relative gl-mr-3">
     ${img}
     ${mergeIcon}
   </span>`;
@@ -851,7 +851,7 @@ UsersSelect.prototype.renderApprovalRules = function (elsClassName, approvalRule
 
   const [rule] = approvalRules;
   const countText = sprintf(__('(+%{count}&nbsp;rules)'), { count });
-  const renderApprovalRulesCount = count > 1 ? `<span class="ml-1">${countText}</span>` : '';
+  const renderApprovalRulesCount = count > 1 ? `<span class="gl-ml-2">${countText}</span>` : '';
   const ruleName = rule.rule_type === 'code_owner' ? __('Code Owner') : escape(rule.name);
 
   return `<div class="gl-display-flex gl-font-sm">

app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue

@@ -194,6 +194,24 @@ export default {
 
       poll.makeRequest();
     },
+    initExtensionFullDataPolling() {
+      const poll = new Poll({
+        resource: {
+          fetchData: () => this.fetchFullData(this),
+        },
+        method: 'fetchData',
+        successCallback: (response) => {
+          this.headerCheck(response, (data) => {
+            this.setFullData(data);
+          });
+        },
+        errorCallback: (e) => {
+          this.setExpandedError(e);
+        },
+      });
+
+      poll.makeRequest();
+    },
     headerCheck(response, callback) {
       const headers = normalizeHeaders(response.headers);
 
@@ -220,6 +238,10 @@ export default {
           });
       }
     },
+    setFullData(data) {
+      this.loadingState = null;
+      this.fullData = data.map((x, i) => ({ id: i, ...x }));
+    },
     setCollapsedData(data) {
       this.collapsedData = data;
       this.loadingState = null;
@@ -229,21 +251,26 @@ export default {
 
       Sentry.captureException(e);
     },
+    setExpandedError(e) {
+      this.loadingState = LOADING_STATES.expandedError;
+      Sentry.captureException(e);
+    },
     loadAllData() {
       if (this.hasFullData) return;
 
       this.loadingState = LOADING_STATES.expandedLoading;
 
-      this.fetchFullData(this)
-        .then((data) => {
-          this.loadingState = null;
-          this.fullData = data.map((x, i) => ({ id: i, ...x }));
-        })
-        .catch((e) => {
-          this.loadingState = LOADING_STATES.expandedError;
-
-          Sentry.captureException(e);
-        });
+      if (this.$options.enableExpandedPolling) {
+        this.initExtensionFullDataPolling();
+      } else {
+        this.fetchFullData(this)
+          .then((data) => {
+            this.setFullData(data);
+          })
+          .catch((e) => {
+            this.setExpandedError(e);
+          });
+      }
     },
     appear(index) {
       if (index === this.fullData.length - 1) {

app/assets/javascripts/vue_merge_request_widget/components/extensions/index.js

@@ -20,6 +20,7 @@ export const registerExtension = (extension) => {
     i18n: extension.i18n,
     expandEvent: extension.expandEvent,
     enablePolling: extension.enablePolling,
+    enableExpandedPolling: extension.enableExpandedPolling,
     modalComponent: extension.modalComponent,
     computed: {
       ...extension.props.reduce(

app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue

@@ -86,7 +86,18 @@ export default {
     createdAt() {
       return getTimeago().format(this.issuable.createdAt);
     },
-    updatedAt() {
+    timestamp() {
+      if (this.issuable.state === 'closed') {
+        return this.issuable.closedAt;
+      }
+      return this.issuable.updatedAt;
+    },
+    formattedTimestamp() {
+      if (this.issuable.state === 'closed') {
+        return sprintf(__('closed %{timeago}'), {
+          timeago: getTimeago().format(this.issuable.closedAt),
+        });
+      }
       return sprintf(__('updated %{timeAgo}'), {
         timeAgo: getTimeago().format(this.issuable.updatedAt),
       });
@@ -311,10 +322,10 @@ export default {
       <div
         v-gl-tooltip.bottom
         class="gl-text-gray-500 gl-display-none gl-sm-display-inline-block"
-        :title="tooltipTitle(issuable.updatedAt)"
-        data-testid="issuable-updated-at"
+        :title="tooltipTitle(timestamp)"
+        data-testid="issuable-timestamp"
       >
-        {{ updatedAt }}
+        {{ formattedTimestamp }}
       </div>
     </div>
   </li>

app/assets/stylesheets/pages/issuable.scss

@@ -709,10 +709,6 @@
         line-height: 20px;
         padding: 0;
       }
-
-      .issue-updated-at {
-        line-height: 20px;
-      }
     }
 
     @include media-breakpoint-down(xs) {
@@ -736,7 +732,7 @@
     .issuable-milestone,
     .issuable-info,
     .task-status,
-    .issuable-updated-at {
+    .issuable-timestamp {
       font-weight: $gl-font-weight-normal;
       color: $gl-text-color-secondary;
 

app/controllers/admin/topics_controller.rb

@@ -4,7 +4,7 @@ class Admin::TopicsController < Admin::ApplicationController
   include SendFileUpload
   include PreviewMarkdown
 
-  before_action :topic, only: [:edit, :update]
+  before_action :topic, only: [:edit, :update, :destroy]
 
   feature_category :projects
 
@@ -37,6 +37,14 @@ def update
     end
   end
 
+  def destroy
+    @topic.destroy!
+
+    redirect_to admin_topics_path,
+                status: :found,
+                notice: _('Topic %{topic_name} was successfully removed.') % { topic_name: @topic.title_or_name }
+  end
+
   private
 
   def topic

app/controllers/concerns/issuable_actions.rb

@@ -184,7 +184,6 @@ def discussions
 
   def paginated_discussions
     return if params[:per_page].blank?
-    return if issuable.instance_of?(Issue) && Feature.disabled?(:paginated_issue_discussions, project)
     return if issuable.instance_of?(MergeRequest) && Feature.disabled?(:paginated_mr_discussions, project)
 
     strong_memoize(:paginated_discussions) do