Add latest changes from gitlab-org/gitlab@master

12 files changed, 25 insertions, 59 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index 37935e9c3c6..6521b86edbb 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -81,18 +81,16 @@ export default {
       :class="{
         'gl-bg-orange-50': blocksMerge && !allResolved,
         'gl-bg-gray-50': !blocksMerge || allResolved,
+        'gl-pr-2': !allResolved,
       }"
       data-testid="discussions-counter-text"
     >
       <template v-if="allResolved">
         {{ __('All threads resolved!') }}
         <gl-dropdown
-          v-gl-tooltip:discussionCounter.hover.bottom
           size="small"
           category="tertiary"
           right
-          :title="__('Thread options')"
-          :aria-label="__('Thread options')"
           toggle-class="btn-icon"
           class="gl-pt-0! gl-px-2 gl-h-full gl-ml-2"
         >
@@ -135,12 +133,9 @@ export default {
             @click="jumpNext"
           />
           <gl-dropdown
-            v-gl-tooltip:discussionCounter.hover.bottom
             size="small"
             category="tertiary"
             right
-            :title="__('Thread options')"
-            :aria-label="__('Thread options')"
             toggle-class="btn-icon"
             class="gl-pt-0! gl-px-2"
           >
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js
index 722f7d467a2..050b004f657 100644
--- a/app/assets/javascripts/profile/gl_crop.js
+++ b/app/assets/javascripts/profile/gl_crop.js
@@ -165,6 +165,7 @@ import { loadCSSFile } from '../lib/utils/css_utils';
     setPreview() {
       const filename = this.fileInput.val().replace(FILENAMEREGEX, '');
       this.previewImage.attr('src', this.dataURL);
+      this.previewImage.attr('srcset', this.dataURL);
       return this.filename.text(filename);
     }
 
diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js
index bf507c620e6..93bc203d391 100644
--- a/app/assets/javascripts/profile/profile.js
+++ b/app/assets/javascripts/profile/profile.js
@@ -19,7 +19,7 @@ export default class Profile {
   initAvatarGlCrop() {
     const cropOpts = {
       filename: '.js-avatar-filename',
-      previewImage: '.avatar-image .avatar',
+      previewImage: '.avatar-image .gl-avatar',
       modalCrop: '.modal-profile-crop',
       pickImageEl: '.js-choose-user-avatar-button',
       uploadImageBtn: '.js-upload-user-avatar',
diff --git a/app/assets/stylesheets/page_bundles/profile.scss b/app/assets/stylesheets/page_bundles/profile.scss
index 9e4deb16a9d..ac1e9fb024b 100644
--- a/app/assets/stylesheets/page_bundles/profile.scss
+++ b/app/assets/stylesheets/page_bundles/profile.scss
@@ -1,19 +1,6 @@
 @import 'mixins_and_variables_and_functions';
 @import 'framework/buttons';
 
-.avatar-image {
-  margin-bottom: $grid-size;
-
-  .avatar {
-    float: none;
-  }
-
-  @include media-breakpoint-up(sm) {
-    float: left;
-    margin-bottom: 0;
-  }
-}
-
 .edit-user {
   .emoji-menu-toggle-button {
     @include emoji-menu-toggle-button;
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index fcb99d0ec2d..2bd26e15953 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -215,7 +215,7 @@ module Ci
 
     validates :maintenance_note, length: { maximum: 1024 }
 
-    alias_attribute :maintenance_note, :maintainer_note
+    alias_attribute :maintenance_note, :maintainer_note # NOTE: Need to keep until REST v5 is implemented
 
     # Searches for runners matching the given query.
     #
@@ -345,7 +345,7 @@ module Ci
     end
 
     # DEPRECATED
-    # TODO Remove in %16.0 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648
+    # TODO Remove in v5 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648
     def deprecated_rest_status
       return :stale if stale?
 
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 1f9ff7804db..dfaa4c31cdf 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -26,7 +26,7 @@
     .col-lg-8
       .avatar-image
         = link_to avatar_icon_for_user(@user, 400), target: '_blank', rel: 'noopener noreferrer' do
-          = image_tag avatar_icon_for_user(@user, 96), alt: '', class: 'avatar s96'
+          = render Pajamas::AvatarComponent.new(@user, size: 96, alt: "", class: 'gl-float-left gl-mr-5')
       %h5.gl-mt-0= s_("Profiles|Upload new avatar")
       .gl-display-flex.gl-align-items-center.gl-my-3
         = render Pajamas::ButtonComponent.new(button_options: { class: 'js-choose-user-avatar-button' }) do
diff --git a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
index 880017dbe36..22571b11639 100644
--- a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
+++ b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
@@ -1,7 +1,8 @@
 - display_issuable_type = issuable_display_type(@merge_request)
 
 .float-left.btn-group.gl-md-ml-3.gl-display-flex.dropdown.gl-new-dropdown.gl-md-w-auto.gl-w-full
-  = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret has-tooltip gl-display-none! gl-md-display-inline-flex!", data: { 'toggle' => 'dropdown' }, title: _('Merge request actions') , 'aria-label': _('Merge request actions') do
+  = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret gl-display-none! gl-md-display-inline-flex!", data: { 'toggle' => 'dropdown' } do
+    %span.gl-sr-only= _('Toggle dropdown')
     = sprite_icon "ellipsis_v", size: 16, css_class: "dropdown-icon gl-icon"
   = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md btn-block gl-button gl-dropdown-toggle gl-md-display-none!", data: { 'toggle' => 'dropdown' } do
     %span.gl-new-dropdown-button-text= _('Merge request actions')
diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml
deleted file mode 100644
index ae0d9ab9908..00000000000
--- a/app/views/projects/repositories/_feed.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-- commit = update
-%tr
-  %td
-    = link_to project_commits_path(@project, commit.head.name) do
-      %strong
-        = commit.head.name
-      - if @project.root_ref?(commit.head.name)
-        %span.label default
-
-  %td
-    %div
-      = link_to project_commits_path(@project, commit.id) do
-        %code= commit.short_id
-      = image_tag avatar_icon_for_email(commit.author_email), class: "", width: 16, alt: ''
-      = markdown(truncate(commit.title, length: 40), pipeline: :single_line, author: commit.author)
-  %td
-    %span.float-right.cgray
-      = time_ago_with_tooltip(commit.committed_date)
diff --git a/app/views/projects/starrers/_starrer.html.haml b/app/views/projects/starrers/_starrer.html.haml
index e24276fcaea..c1cd2488142 100644
--- a/app/views/projects/starrers/_starrer.html.haml
+++ b/app/views/projects/starrers/_starrer.html.haml
@@ -2,8 +2,8 @@
 
 .col-lg-3.col-md-4.col-sm-12
   .card
-    .card-body
-      = image_tag avatar_icon_for_user(starrer.user, 40), class: "avatar s40", alt: ''
+    .card-body.gl-display-flex
+      = render Pajamas::AvatarComponent.new(starrer.user, size: 48, alt: "", class: 'gl-mr-3')
 
       .user-info
         .block-truncated
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml
index 0ace69f2a1d..6caadeb0ba4 100644
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@@ -2,7 +2,7 @@
 - notes_count = @noteable_meta_data[snippet.id].user_notes_count
 
 %li.snippet-row.py-3{ data: { qa_selector: 'snippet_link', qa_snippet_title: snippet.title } }
-  = image_tag avatar_icon_for_user(snippet.author), class: "avatar s40 d-none d-sm-block", alt: ''
+  = render Pajamas::AvatarComponent.new(snippet.author, size: 48, alt: "", class: 'gl-display-none gl-sm-display-block gl-float-left gl-mr-3')
 
   = link_to gitlab_snippet_path(snippet), class: "title" do
     = snippet.title
diff --git a/app/views/shared/users/_user.html.haml b/app/views/shared/users/_user.html.haml
index 93b3ce5f319..51eb24f6d4a 100644
--- a/app/views/shared/users/_user.html.haml
+++ b/app/views/shared/users/_user.html.haml
@@ -3,7 +3,7 @@
 .col-lg-3.col-md-4.col-sm-12
   = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }) do |c|
     = c.body do
-      = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: ''
+      = render Pajamas::AvatarComponent.new(user, size: 48, alt: "", class: 'gl-float-left gl-mr-3')
 
       .user-info
         .block-truncated
diff --git a/app/workers/concerns/gitlab/github_import/object_importer.rb b/app/workers/concerns/gitlab/github_import/object_importer.rb
index c2cd50d8c21..060a9f2648e 100644
--- a/app/workers/concerns/gitlab/github_import/object_importer.rb
+++ b/app/workers/concerns/gitlab/github_import/object_importer.rb
@@ -44,20 +44,9 @@ module Gitlab
         # This exception will be more useful in development when a new
         # Representation is created but the developer forgot to add a
         # `:github_identifiers` field.
-        Gitlab::Import::ImportFailureService.track(
-          project_id: project.id,
-          error_source: importer_class.name,
-          exception: e,
-          fail_import: true
-        )
-
-        raise(e)
+        track_and_raise_exception(project, e, fail_import: true)
       rescue StandardError => e
-        Gitlab::Import::ImportFailureService.track(
-          project_id: project.id,
-          error_source: importer_class.name,
-          exception: e
-        )
+        track_and_raise_exception(project, e)
       end
 
       def object_type
@@ -90,6 +79,17 @@ module Gitlab
           github_identifiers: github_identifiers
         )
       end
+
+      def track_and_raise_exception(project, exception, fail_import: false)
+        Gitlab::Import::ImportFailureService.track(
+          project_id: project.id,
+          error_source: importer_class.name,
+          exception: exception,
+          fail_import: fail_import
+        )
+
+        raise(exception)
+      end
     end
   end
 end