Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/rules.gitlab-ci.yml

@@ -96,7 +96,6 @@ Layout/LineContinuationSpacing:
     - 'lib/api/go_proxy.rb'
     - 'lib/api/groups.rb'
     - 'lib/api/issue_links.rb'
-    - 'lib/api/metrics/dashboard/annotations.rb'
     - 'lib/gitlab/auth/user_access_denied_reason.rb'
     - 'lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb'
     - 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb'

.rubocop_todo/layout/line_continuation_spacing.yml

@@ -464,7 +464,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'lib/api/groups.rb'
     - 'lib/api/issue_links.rb'
     - 'lib/api/metadata.rb'
-    - 'lib/api/metrics/dashboard/annotations.rb'
     - 'lib/api/ml/mlflow/registered_models.rb'
     - 'lib/api/ml/mlflow/runs.rb'
     - 'lib/api/releases.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -325,6 +325,7 @@ Layout/LineLength:
     - 'app/models/integrations/harbor.rb'
     - 'app/models/integrations/jenkins.rb'
     - 'app/models/integrations/mattermost.rb'
+    - 'app/models/integrations/matrix.rb'
     - 'app/models/integrations/microsoft_teams.rb'
     - 'app/models/integrations/pipelines_email.rb'
     - 'app/models/integrations/pivotaltracker.rb'
@@ -4029,8 +4030,6 @@ Layout/LineLength:
     - 'spec/requests/api/members_spec.rb'
     - 'spec/requests/api/merge_request_diffs_spec.rb'
     - 'spec/requests/api/merge_requests_spec.rb'
-    - 'spec/requests/api/metrics/dashboard/annotations_spec.rb'
-    - 'spec/requests/api/metrics/user_starred_dashboards_spec.rb'
     - 'spec/requests/api/notes_spec.rb'
     - 'spec/requests/api/notification_settings_spec.rb'
     - 'spec/requests/api/npm_project_packages_spec.rb'

.rubocop_todo/layout/line_length.yml

@@ -46,30 +46,16 @@ Rails/OutputSafety:
     - 'app/mailers/notify.rb'
     - 'app/models/concerns/restricted_signup.rb'
     - 'app/models/integrations/apple_app_store.rb'
-    - 'app/models/integrations/asana.rb'
-    - 'app/models/integrations/bamboo.rb'
-    - 'app/models/integrations/bugzilla.rb'
     - 'app/models/integrations/campfire.rb'
     - 'app/models/integrations/clickup.rb'
     - 'app/models/integrations/confluence.rb'
     - 'app/models/integrations/custom_issue_tracker.rb'
     - 'app/models/integrations/datadog.rb'
     - 'app/models/integrations/discord.rb'
-    - 'app/models/integrations/ewm.rb'
     - 'app/models/integrations/external_wiki.rb'
     - 'app/models/integrations/google_play.rb'
     - 'app/models/integrations/hangouts_chat.rb'
     - 'app/models/integrations/irker.rb'
-    - 'app/models/integrations/jenkins.rb'
-    - 'app/models/integrations/mattermost.rb'
-    - 'app/models/integrations/pivotaltracker.rb'
-    - 'app/models/integrations/pumble.rb'
-    - 'app/models/integrations/redmine.rb'
-    - 'app/models/integrations/squash_tm.rb'
-    - 'app/models/integrations/telegram.rb'
-    - 'app/models/integrations/unify_circuit.rb'
-    - 'app/models/integrations/webex_teams.rb'
-    - 'app/models/integrations/youtrack.rb'
     - 'app/presenters/ci/pipeline_presenter.rb'
     - 'app/presenters/key_presenter.rb'
     - 'app/presenters/project_presenter.rb'

.rubocop_todo/rails/output_safety.yml

@@ -1158,8 +1158,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'spec/requests/api/maven_packages_spec.rb'
     - 'spec/requests/api/merge_request_approvals_spec.rb'
     - 'spec/requests/api/merge_requests_spec.rb'
-    - 'spec/requests/api/metrics/dashboard/annotations_spec.rb'
-    - 'spec/requests/api/metrics/user_starred_dashboards_spec.rb'
     - 'spec/requests/api/nuget_group_packages_spec.rb'
     - 'spec/requests/api/package_files_spec.rb'
     - 'spec/requests/api/pages/internal_access_spec.rb'

.rubocop_todo/rspec/before_all_role_assignment.yml

@@ -2268,7 +2268,6 @@ RSpec/ContextWording:
     - 'spec/requests/api/members_spec.rb'
     - 'spec/requests/api/merge_request_diffs_spec.rb'
     - 'spec/requests/api/merge_requests_spec.rb'
-    - 'spec/requests/api/metrics/user_starred_dashboards_spec.rb'
     - 'spec/requests/api/notes_spec.rb'
     - 'spec/requests/api/npm_project_packages_spec.rb'
     - 'spec/requests/api/nuget_group_packages_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -2597,6 +2597,7 @@ RSpec/NamedSubject:
     - 'spec/models/integrations/irker_spec.rb'
     - 'spec/models/integrations/jenkins_spec.rb'
     - 'spec/models/integrations/mattermost_slash_commands_spec.rb'
+    - 'spec/models/integrations/matrix_spec.rb'
     - 'spec/models/integrations/pipelines_email_spec.rb'
     - 'spec/models/integrations/pivotaltracker_spec.rb'
     - 'spec/models/integrations/pushover_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -61,6 +61,7 @@ export default class ActivityCalendar {
   constructor({
     container,
     activitiesContainer,
+    recentActivitiesContainer,
     timestamps,
     calendarActivitiesPath,
     utcOffset = 0,
@@ -91,6 +92,7 @@ export default class ActivityCalendar {
     this.months = [];
     this.firstDayOfWeek = firstDayOfWeek;
     this.activitiesContainer = activitiesContainer;
+    this.recentActivitiesContainer = recentActivitiesContainer;
     this.container = container;
     this.onClickDay = onClickDay;
 
@@ -276,6 +278,8 @@ export default class ActivityCalendar {
         .empty()
         .append(loadingIconForLegacyJS({ size: 'lg' }));
 
+      $(this.recentActivitiesContainer).hide();
+
       axios
         .get(this.calendarActivitiesPath, {
           params: {
@@ -300,6 +304,7 @@ export default class ActivityCalendar {
     } else {
       this.currentSelectedDate = '';
       $(this.activitiesContainer).html('');
+      $(this.recentActivitiesContainer).show();
     }
   }
 }

app/assets/javascripts/pages/users/activity_calendar.js

@@ -267,6 +267,7 @@ export default class UserTabs {
     new ActivityCalendar({
       container: '.tab-pane.active .js-contrib-calendar',
       activitiesContainer: '.tab-pane.active .user-calendar-activities',
+      recentActivitiesContainer: '.tab-pane.active .overview-content-list',
       timestamps: data,
       calendarActivitiesPath,
       utcOffset,

app/assets/javascripts/pages/users/user_tabs.js

@@ -37,6 +37,11 @@ export default {
       isFormVisible: false,
     };
   },
+  computed: {
+    displayedCount() {
+      return this.icon && !this.count ? '0' : this.count;
+    },
+  },
   methods: {
     toggleForm() {
       this.isFormVisible = !this.isFormVisible;
@@ -64,12 +69,12 @@ export default {
           >
             {{ title }}
             <span
-              v-if="count"
+              v-if="displayedCount"
               class="gl-inline-flex gl-items-center gl-gap-2 gl-text-sm gl-text-secondary"
               data-testid="crud-count"
             >
-              <gl-icon v-if="icon" :name="icon" />
-              {{ count }}
+              <gl-icon v-if="icon" :name="icon" data-testid="crud-icon" />
+              {{ displayedCount }}
             </span>
           </h2>
           <p

app/assets/javascripts/vue_shared/components/crud_component.vue

@@ -1,4 +1,4 @@
-%section.settings-section{ id: @id, data: (@testid ? { testid: @testid } : {}) }
+%section.settings-section{ options_attrs }
   .settings-sticky-header
     .settings-sticky-header-inner
       %h2.gl-heading-2{ class: '!gl-mb-2' }

app/components/layouts/settings_section_component.haml

@@ -6,15 +6,30 @@ class SettingsSectionComponent < ViewComponent::Base
     # @param [String] description
     # @param [String] id
     # @param [String] testid
-    def initialize(heading, description: nil, id: nil, testid: nil)
+    # @param [Hash] options
+    def initialize(heading, description: nil, id: nil, testid: nil, options: nil)
       @heading = heading
       @description = description
       @id = id
       @testid = testid
+      @options = options || {}
     end
 
     renders_one :heading
     renders_one :description
     renders_one :body
+
+    def options_attrs
+      data = @options[:data] || {}
+      data[:testid] ||= @testid
+
+      attrs = {
+        class: [@options[:class]].flatten.compact,
+        data: data
+      }
+      attrs[:id] = @id if @id
+
+      @options.merge(attrs)
+    end
   end
 end

app/components/layouts/settings_section_component.rb

@@ -6,6 +6,7 @@ class SourceUsersController < ApplicationController
 
     before_action :source_user
     before_action :check_current_user_matches_invite!
+    before_action :check_source_user_status!
 
     respond_to :html
     feature_category :importers
@@ -14,28 +15,37 @@ def accept
       if source_user.accept
         # TODO: This is where we enqueue the job to assign the contributions.
 
-        redirect_to(root_path, notice: format(mapping_decision_notice('approved'), invite_details))
+        flash[:raw] = banner('accept_invite')
+        redirect_to(dashboard_groups_path)
       else
-        redirect_to(root_path, alert: _('The invitation could not be accepted.'))
+        redirect_to(dashboard_groups_path, alert: s_('UserMapping|The invitation could not be accepted.'))
       end
     end
 
     def decline
       if source_user.reject
-        redirect_to(root_path, notice: format(mapping_decision_notice('rejected'), invite_details))
+        flash[:raw] = banner('reject_invite')
+        redirect_to(dashboard_groups_path)
       else
-        redirect_to(root_path, alert: _('The invitation could not be declined.'))
+        redirect_to(dashboard_groups_path, alert: s_('UserMapping|The invitation could not be declined.'))
       end
     end
 
-    def show
-      redirect_to(root_path, alert: _('The invitation is not valid')) unless source_user.awaiting_approval?
-    end
+    def show; end
 
     private
 
+    def check_source_user_status!
+      return if source_user.awaiting_approval?
+
+      redirect_to(dashboard_groups_path, alert: s_('UserMapping|The invitation is not valid'))
+    end
+
     def check_current_user_matches_invite!
-      not_found unless current_user_matches_invite?
+      return if current_user_matches_invite?
+
+      flash[:raw] = banner('cancel_invite')
+      redirect_to(dashboard_groups_path)
     end
 
     def current_user_matches_invite?
@@ -47,24 +57,19 @@ def source_user
     end
     strong_memoize_attr :source_user
 
-    def invite_details
-      {
-        source_username: source_user.source_username,
-        source_hostname: source_user.source_hostname,
-        destination_group: source_user.namespace.name
-      }
-    end
-
     def check_feature_flag!
       not_found unless Feature.enabled?(:importer_user_mapping, current_user)
     end
 
-    # TODO: This is a placeholder for the proper UI to be provided
-    # in a follow-up MR.
-    def mapping_decision_notice(decision)
-      "You have #{decision} the reassignment of contributions from " \
-        "%{source_username} on %{source_hostname} " \
-        "to yourself on %{destination_group}."
+    def banner(partial)
+      render_to_string(
+        partial: partial,
+        layout: false,
+        formats: :html,
+        locals: {
+          source_user: source_user
+        }
+      ).html_safe # rubocop: disable Rails/OutputSafety -- render_to_string already makes the string safe
     end
   end
 end

app/controllers/import/source_users_controller.rb

@@ -21,7 +21,7 @@ class Integration < ApplicationRecord
   INTEGRATION_NAMES = %w[
     asana assembla bamboo bugzilla buildkite campfire clickup confluence custom_issue_tracker
     datadog diffblue_cover discord drone_ci emails_on_push ewm external_wiki
-    gitlab_slack_application hangouts_chat harbor irker jira jira_cloud_app
+    gitlab_slack_application hangouts_chat harbor irker jira jira_cloud_app matrix
     mattermost mattermost_slash_commands microsoft_teams packagist phorge pipelines_email
     pivotaltracker prometheus pumble pushover redmine slack slack_slash_commands squash_tm teamcity telegram
     unify_circuit webex_teams youtrack zentao
@@ -745,6 +745,18 @@ def toggle!
 
   private
 
+  def self.build_help_page_url(url_path, help_text, options = {})
+    docs_link = ActionController::Base.helpers.link_to(
+      '',
+      Rails.application.routes.url_helpers.help_page_url(url_path, **options),
+      target: '_blank',
+      rel: 'noopener noreferrer'
+    )
+    tag_pair_docs_link = tag_pair(docs_link, :link_start, :link_end)
+
+    safe_format(help_text + s_(" %{link_start}Learn More%{link_end}."), tag_pair_docs_link)
+  end
+
   # Ancestors sorted by hierarchy depth in bottom-top order.
   def self.sorted_ancestors(scope)
     if scope.root_ancestor.use_traversal_ids?

app/models/integration.rb

@@ -32,8 +32,7 @@ def self.description
     end
 
     def self.help
-      docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/asana'), target: '_blank', rel: 'noopener noreferrer'
-      s_('Add commit messages as comments to Asana tasks. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
+      build_help_page_url('user/project/integrations/asana', s_('Add commit messages as comments to Asana tasks.'))
     end
 
     def self.to_param

app/models/integrations/asana.rb

@@ -53,16 +53,11 @@ def self.description
     end
 
     def self.help
-      docs_link = ActionController::Base.helpers.link_to(
-        _('Learn more.'),
-        Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bamboo'),
-        target: '_blank',
-        rel: 'noopener noreferrer'
+      build_help_page_url(
+        'user/project/integrations/bamboo',
+        s_('BambooService|Run CI/CD pipelines with Atlassian Bamboo. You must set up automatic revision ' \
+        'labeling and a repository trigger in Bamboo.')
       )
-      format(
-        s_('BambooService|Run CI/CD pipelines with Atlassian Bamboo. You must set up automatic revision labeling and ' \
-           'a repository trigger in Bamboo. %{docs_link}').html_safe,
-        docs_link: docs_link.html_safe)
     end
 
     def self.to_param

app/models/integrations/bamboo.rb

@@ -16,12 +16,9 @@ def self.description
     end
 
     def self.help
-      docs_link = ActionController::Base.helpers.link_to _('Learn more.'),
-        Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bugzilla'),
-        target: '_blank',
-        rel: 'noopener noreferrer'
-      format(s_("IssueTracker|Use Bugzilla as this project's issue tracker. %{docs_link}").html_safe,
-        docs_link: docs_link.html_safe)
+      build_help_page_url(
+        'user/project/integrations/bugzilla', s_("IssueTracker|Use Bugzilla as this project's issue tracker.")
+      )
     end
 
     def self.to_param

app/models/integrations/bugzilla.rb

@@ -19,8 +19,10 @@ def self.description
     end
 
     def self.help
-      docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/ewm'), target: '_blank', rel: 'noopener noreferrer'
-      s_("IssueTracker|Use IBM Engineering Workflow Management as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe }
+      build_help_page_url(
+        'user/project/integrations/ewm',
+        s_("IssueTracker|Use IBM Engineering Workflow Management as this project's issue tracker.")
+      )
     end
 
     def self.to_param

app/models/integrations/ewm.rb

@@ -78,8 +78,10 @@ def self.description
     end
 
     def self.help
-      docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('integration/jenkins'), target: '_blank', rel: 'noopener noreferrer'
-      s_('Run CI/CD pipelines with Jenkins when you push to a repository, or when a merge request is created, updated, or merged. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
+      build_help_page_url(
+        'integration/jenkins',
+        s_("Run CI/CD pipelines with Jenkins when you push to a repository, or when a merge request is created, updated, or merged.")
+      )
     end
 
     def self.to_param