Add latest changes from gitlab-org/gitlab@master

8 files changed, 124 insertions, 117 deletions

diff --git a/app/assets/javascripts/registry/explorer/constants.js b/app/assets/javascripts/registry/explorer/constants.js
index d4b9d25b212..4ca4c7088a6 100644
--- a/app/assets/javascripts/registry/explorer/constants.js
+++ b/app/assets/javascripts/registry/explorer/constants.js
@@ -39,14 +39,20 @@ export const DELETE_IMAGE_SUCCESS_MESSAGE = s__(
 
 // Image details page
 
+export const DETAILS_PAGE_TITLE = s__('ContainerRegistry|%{imageName} tags');
+
 export const DELETE_TAG_ERROR_MESSAGE = s__(
-  'ContainerRegistry|Something went wrong while deleting the tag.',
+  'ContainerRegistry|Something went wrong while marking the tag for deletion.',
+);
+export const DELETE_TAG_SUCCESS_MESSAGE = s__(
+  'ContainerRegistry|Tag successfully marked for deletion.',
 );
-export const DELETE_TAG_SUCCESS_MESSAGE = s__('ContainerRegistry|Tag deleted successfully');
 export const DELETE_TAGS_ERROR_MESSAGE = s__(
-  'ContainerRegistry|Something went wrong while deleting the tags.',
+  'ContainerRegistry|Something went wrong while marking the tags for deletion.',
+);
+export const DELETE_TAGS_SUCCESS_MESSAGE = s__(
+  'ContainerRegistry|Tags successfully marked for deletion.',
 );
-export const DELETE_TAGS_SUCCESS_MESSAGE = s__('ContainerRegistry|Tags deleted successfully');
 
 export const DEFAULT_PAGE = 1;
 export const DEFAULT_PAGE_SIZE = 10;
@@ -65,6 +71,27 @@ export const LIST_LABEL_IMAGE_ID = s__('ContainerRegistry|Image ID');
 export const LIST_LABEL_SIZE = s__('ContainerRegistry|Compressed Size');
 export const LIST_LABEL_LAST_UPDATED = s__('ContainerRegistry|Last Updated');
 
+export const REMOVE_TAG_BUTTON_TITLE = s__('ContainerRegistry|Remove tag');
+export const REMOVE_TAGS_BUTTON_TITLE = s__('ContainerRegistry|Remove selected tags');
+
+export const REMOVE_TAG_CONFIRMATION_TEXT = s__(
+  `ContainerRegistry|You are about to remove %{item}. Are you sure?`,
+);
+export const REMOVE_TAGS_CONFIRMATION_TEXT = s__(
+  `ContainerRegistry|You are about to remove %{item} tags. Are you sure?`,
+);
+
+export const EMPTY_IMAGE_REPOSITORY_TITLE = s__('ContainerRegistry|This image has no active tags');
+export const EMPTY_IMAGE_REPOSITORY_MESSAGE = s__(
+  `ContainerRegistry|The last tag related to this image was recently removed.
+This empty image and any associated data will be automatically removed as part of the regular Garbage Collection process.
+If you have any questions, contact your administrator.`,
+);
+
+export const ADMIN_GARBAGE_COLLECTION_TIP = s__(
+  'ContainerRegistry|Remember to run %{docLinkStart}garbage collection%{docLinkEnd} to remove the stale data from storage.',
+);
+
 // Expiration policies
 
 export const EXPIRATION_POLICY_ALERT_TITLE = s__(
diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue
index 6afd4d1107a..1d4dcd9a7a2 100644
--- a/app/assets/javascripts/registry/explorer/pages/details.vue
+++ b/app/assets/javascripts/registry/explorer/pages/details.vue
@@ -9,12 +9,14 @@ import {
   GlPagination,
   GlModal,
   GlSprintf,
+  GlAlert,
+  GlLink,
   GlEmptyState,
   GlResizeObserverDirective,
   GlSkeletonLoader,
 } from '@gitlab/ui';
 import { GlBreakpointInstance } from '@gitlab/ui/dist/utils';
-import { n__, s__ } from '~/locale';
+import { n__ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
@@ -35,6 +37,14 @@ import {
   DELETE_TAG_ERROR_MESSAGE,
   DELETE_TAGS_SUCCESS_MESSAGE,
   DELETE_TAGS_ERROR_MESSAGE,
+  REMOVE_TAG_CONFIRMATION_TEXT,
+  REMOVE_TAGS_CONFIRMATION_TEXT,
+  DETAILS_PAGE_TITLE,
+  REMOVE_TAGS_BUTTON_TITLE,
+  REMOVE_TAG_BUTTON_TITLE,
+  EMPTY_IMAGE_REPOSITORY_TITLE,
+  EMPTY_IMAGE_REPOSITORY_MESSAGE,
+  ADMIN_GARBAGE_COLLECTION_TIP,
 } from '../constants';
 
 export default {
@@ -49,6 +59,8 @@ export default {
     GlSkeletonLoader,
     GlSprintf,
     GlEmptyState,
+    GlAlert,
+    GlLink,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -60,6 +72,19 @@ export default {
     width: 1000,
     height: 40,
   },
+  i18n: {
+    DETAILS_PAGE_TITLE,
+    REMOVE_TAGS_BUTTON_TITLE,
+    REMOVE_TAG_BUTTON_TITLE,
+    EMPTY_IMAGE_REPOSITORY_TITLE,
+    EMPTY_IMAGE_REPOSITORY_MESSAGE,
+  },
+  alertMessages: {
+    success_tag: DELETE_TAG_SUCCESS_MESSAGE,
+    danger_tag: DELETE_TAG_ERROR_MESSAGE,
+    success_tags: DELETE_TAGS_SUCCESS_MESSAGE,
+    danger_tags: DELETE_TAGS_ERROR_MESSAGE,
+  },
   data() {
     return {
       selectedItems: [],
@@ -67,6 +92,7 @@ export default {
       selectAllChecked: false,
       modalDescription: null,
       isDesktop: true,
+      deleteAlertType: false,
     };
   },
   computed: {
@@ -110,20 +136,40 @@ export default {
         this.requestTagsList({ pagination: { page }, params: this.$route.params.id });
       },
     },
+    deleteAlertConfig() {
+      const config = {
+        title: '',
+        message: '',
+        type: 'success',
+      };
+      if (this.deleteAlertType) {
+        [config.type] = this.deleteAlertType.split('_');
+
+        const defaultMessage = this.$options.alertMessages[this.deleteAlertType];
+
+        if (this.config.isAdmin && config.type === 'success') {
+          config.title = defaultMessage;
+          config.message = ADMIN_GARBAGE_COLLECTION_TIP;
+        } else {
+          config.message = defaultMessage;
+        }
+      }
+      return config;
+    },
   },
   methods: {
     ...mapActions(['requestTagsList', 'requestDeleteTag', 'requestDeleteTags']),
     setModalDescription(itemIndex = -1) {
       if (itemIndex === -1) {
         this.modalDescription = {
-          message: s__(`ContainerRegistry|You are about to remove %{item} tags. Are you sure?`),
+          message: REMOVE_TAGS_CONFIRMATION_TEXT,
           item: this.itemsToBeDeleted.length,
         };
       } else {
         const { path } = this.tags[itemIndex];
 
         this.modalDescription = {
-          message: s__(`ContainerRegistry|You are about to remove %{item}. Are you sure?`),
+          message: REMOVE_TAG_CONFIRMATION_TEXT,
           item: path,
         };
       }
@@ -179,19 +225,17 @@ export default {
       this.track('click_button');
       this.$refs.deleteModal.show();
     },
-    handleSingleDelete(itemToDelete) {
+    handleSingleDelete(index) {
+      const itemToDelete = this.tags[index];
       this.itemsToBeDeleted = [];
+      this.selectedItems = this.selectedItems.filter(i => i !== index);
       return this.requestDeleteTag({ tag: itemToDelete, params: this.$route.params.id })
-        .then(() =>
-          this.$toast.show(DELETE_TAG_SUCCESS_MESSAGE, {
-            type: 'success',
-          }),
-        )
-        .catch(() =>
-          this.$toast.show(DELETE_TAG_ERROR_MESSAGE, {
-            type: 'error',
-          }),
-        );
+        .then(() => {
+          this.deleteAlertType = 'success_tag';
+        })
+        .catch(() => {
+          this.deleteAlertType = 'danger_tag';
+        });
     },
     handleMultipleDelete() {
       const { itemsToBeDeleted } = this;
@@ -202,24 +246,19 @@ export default {
         ids: itemsToBeDeleted.map(x => this.tags[x].name),
         params: this.$route.params.id,
       })
-        .then(() =>
-          this.$toast.show(DELETE_TAGS_SUCCESS_MESSAGE, {
-            type: 'success',
-          }),
-        )
-        .catch(() =>
-          this.$toast.show(DELETE_TAGS_ERROR_MESSAGE, {
-            type: 'error',
-          }),
-        );
+        .then(() => {
+          this.deleteAlertType = 'success_tags';
+        })
+        .catch(() => {
+          this.deleteAlertType = 'danger_tags';
+        });
     },
     onDeletionConfirmed() {
       this.track('confirm_delete');
       if (this.isMultiDelete) {
         this.handleMultipleDelete();
       } else {
-        const index = this.itemsToBeDeleted[0];
-        this.handleSingleDelete(this.tags[index]);
+        this.handleSingleDelete(this.itemsToBeDeleted[0]);
       }
     },
     handleResize() {
@@ -231,9 +270,24 @@ export default {
 
 <template>
   <div v-gl-resize-observer="handleResize" class="my-3 w-100 slide-enter-to-element">
+    <gl-alert
+      v-if="deleteAlertType"
+      :variant="deleteAlertConfig.type"
+      :title="deleteAlertConfig.title"
+      class="my-2"
+      @dismiss="deleteAlertType = null"
+    >
+      <gl-sprintf :message="deleteAlertConfig.message">
+        <template #docLink="{content}">
+          <gl-link :href="config.garbageCollectionHelpPagePath" target="_blank">
+            {{ content }}
+          </gl-link>
+        </template>
+      </gl-sprintf>
+    </gl-alert>
     <div class="d-flex my-3 align-items-center">
       <h4>
-        <gl-sprintf :message="s__('ContainerRegistry|%{imageName} tags')">
+        <gl-sprintf :message="$options.i18n.DETAILS_PAGE_TITLE">
           <template #imageName>
             {{ imageName }}
           </template>
@@ -256,8 +310,8 @@ export default {
           :disabled="!selectedItems || selectedItems.length === 0"
           class="float-right"
           variant="danger"
-          :title="s__('ContainerRegistry|Remove selected tags')"
-          :aria-label="s__('ContainerRegistry|Remove selected tags')"
+          :title="$options.i18n.REMOVE_TAGS_BUTTON_TITLE"
+          :aria-label="$options.i18n.REMOVE_TAGS_BUTTON_TITLE"
           @click="deleteMultipleItems()"
         >
           <gl-icon name="remove" />
@@ -306,8 +360,8 @@ export default {
       <template #cell(actions)="{index, item}">
         <gl-deprecated-button
           ref="singleDeleteButton"
-          :title="s__('ContainerRegistry|Remove tag')"
-          :aria-label="s__('ContainerRegistry|Remove tag')"
+          :title="$options.i18n.REMOVE_TAG_BUTTON_TITLE"
+          :aria-label="$options.i18n.REMOVE_TAG_BUTTON_TITLE"
           :disabled="!item.destroy_path"
           variant="danger"
           class="js-delete-registry float-right btn-inverted btn-border-color btn-icon"
@@ -337,15 +391,9 @@ export default {
         </template>
         <gl-empty-state
           v-else
-          :title="s__('ContainerRegistry|This image has no active tags')"
+          :title="$options.i18n.EMPTY_IMAGE_REPOSITORY_TITLE"
           :svg-path="config.noContainersImage"
-          :description="
-            s__(
-              `ContainerRegistry|The last tag related to this image was recently removed.
-            This empty image and any associated data will be automatically removed as part of the regular Garbage Collection process.
-            If you have any questions, contact your administrator.`,
-            )
-          "
+          :description="$options.i18n.EMPTY_IMAGE_REPOSITORY_MESSAGE"
           class="mx-auto my-0"
         />
       </template>
diff --git a/app/assets/javascripts/registry/explorer/pages/index.vue b/app/assets/javascripts/registry/explorer/pages/index.vue
index 95d83c82987..709a163d56d 100644
--- a/app/assets/javascripts/registry/explorer/pages/index.vue
+++ b/app/assets/javascripts/registry/explorer/pages/index.vue
@@ -1,46 +1,9 @@
 <script>
-import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
-import { mapState, mapActions, mapGetters } from 'vuex';
-import { s__ } from '~/locale';
-
-export default {
-  components: {
-    GlAlert,
-    GlSprintf,
-    GlLink,
-  },
-  i18n: {
-    garbageCollectionTipText: s__(
-      'ContainerRegistry|This Registry contains deleted image tag data. Remember to run  %{docLinkStart}garbage collection%{docLinkEnd} to remove the stale data from storage.',
-    ),
-  },
-  computed: {
-    ...mapState(['config']),
-    ...mapGetters(['showGarbageCollection']),
-  },
-  methods: {
-    ...mapActions(['setShowGarbageCollectionTip']),
-  },
-};
+export default {};
 </script>
 
 <template>
   <div>
-    <gl-alert
-      v-if="showGarbageCollection"
-      variant="tip"
-      class="my-2"
-      @dismiss="setShowGarbageCollectionTip(false)"
-    >
-      <gl-sprintf :message="$options.i18n.garbageCollectionTipText">
-        <template #docLink="{content}">
-          <gl-link :href="config.garbageCollectionHelpPagePath" target="_blank">
-            {{ content }}
-          </gl-link>
-        </template>
-      </gl-sprintf>
-    </gl-alert>
-
     <transition name="slide">
       <router-view ref="router-view" />
     </transition>
diff --git a/app/assets/javascripts/registry/explorer/stores/actions.js b/app/assets/javascripts/registry/explorer/stores/actions.js
index b4f66dbbcd6..6e3cf3f0c80 100644
--- a/app/assets/javascripts/registry/explorer/stores/actions.js
+++ b/app/assets/javascripts/registry/explorer/stores/actions.js
@@ -66,7 +66,7 @@ export const requestDeleteTag = ({ commit, dispatch, state }, { tag, params }) =
       dispatch('setShowGarbageCollectionTip', true);
       return dispatch('requestTagsList', { pagination: state.tagsPagination, params });
     })
-    .catch(() => {
+    .finally(() => {
       commit(types.SET_MAIN_LOADING, false);
     });
 };
@@ -83,7 +83,7 @@ export const requestDeleteTags = ({ commit, dispatch, state }, { ids, params })
       dispatch('setShowGarbageCollectionTip', true);
       return dispatch('requestTagsList', { pagination: state.tagsPagination, params });
     })
-    .catch(() => {
+    .finally(() => {
       commit(types.SET_MAIN_LOADING, false);
     });
 };
diff --git a/app/models/group.rb b/app/models/group.rb
index d61705ca605..fd0f9cc223c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -15,7 +15,6 @@ class Group < Namespace
   include WithUploads
   include Gitlab::Utils::StrongMemoize
   include GroupAPICompatibility
-  include HasWiki
 
   ACCESS_REQUEST_APPROVERS_TO_BE_NOTIFIED_LIMIT = 10
 
diff --git a/app/models/group_wiki.rb b/app/models/group_wiki.rb
deleted file mode 100644
index 703ef80c121..00000000000
--- a/app/models/group_wiki.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class GroupWiki < Wiki
-  alias_method :group, :container
-
-  override :storage
-  def storage
-    @storage ||= Storage::Hashed.new(container, prefix: Storage::Hashed::GROUP_REPOSITORY_PATH_PREFIX)
-  end
-
-  override :repository_storage
-  def repository_storage
-    # TODO: Add table to track storage
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/207865
-    'default'
-  end
-
-  override :hashed_storage?
-  def hashed_storage?
-    true
-  end
-
-  override :disk_path
-  def disk_path(*args, &block)
-    storage.disk_path + '.wiki'
-  end
-end
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index e8987265a93..5f596ea7920 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -86,9 +86,9 @@
 
   .content-block.emoji-block.emoji-block-sticky
     .row
-      .col-md-12.col-lg-6.js-noteable-awards
+      .col-md-12.col-lg-4.js-noteable-awards
         = render 'award_emoji/awards_block', awardable: @issue, inline: true
-      .col-md-12.col-lg-6.new-branch-col
+      .col-md-12.col-lg-8.new-branch-col
         #js-vue-sort-issue-discussions
         #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } }
         = render 'new_branch' if show_new_branch_button?
diff --git a/app/views/projects/static_site_editor/show.html.haml b/app/views/projects/static_site_editor/show.html.haml
index 88c5378fc35..8d2649be588 100644
--- a/app/views/projects/static_site_editor/show.html.haml
+++ b/app/views/projects/static_site_editor/show.html.haml
@@ -1,4 +1 @@
--# TODO: Remove after base URL is included in the model !30735
-- data = @config.payload.merge({ base_url: namespace_project_show_sse_path })
-
-#static-site-editor{ data: data }
+#static-site-editor{ data: @config.payload }