app/assets/javascripts/vue_shared/components/runner_instructions/constants.js

@@ -2,6 +2,8 @@ import { s__ } from '~/locale';
 
 export const PLATFORMS_WITHOUT_ARCHITECTURES = ['docker', 'kubernetes'];
 
+export const REGISTRATION_TOKEN_PLACEHOLDER = '$REGISTRATION_TOKEN';
+
 export const INSTRUCTIONS_PLATFORMS_WITHOUT_ARCHITECTURES = {
   docker: {
     instructions: s__(

app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions_modal.vue

@@ -16,8 +16,9 @@ import { isEmpty } from 'lodash';
 import { __, s__ } from '~/locale';
 import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 import {
-  PLATFORMS_WITHOUT_ARCHITECTURES,
   INSTRUCTIONS_PLATFORMS_WITHOUT_ARCHITECTURES,
+  PLATFORMS_WITHOUT_ARCHITECTURES,
+  REGISTRATION_TOKEN_PLACEHOLDER,
 } from './constants';
 import getRunnerPlatformsQuery from './graphql/queries/get_runner_platforms.query.graphql';
 import getRunnerSetupInstructionsQuery from './graphql/queries/get_runner_setup.query.graphql';
@@ -44,6 +45,11 @@ export default {
       required: false,
       default: 'runner-instructions-modal',
     },
+    registrationToken: {
+      type: String,
+      required: false,
+      default: null,
+    },
   },
   apollo: {
     platforms: {
@@ -118,6 +124,15 @@ export default {
     runnerInstallationLink() {
       return INSTRUCTIONS_PLATFORMS_WITHOUT_ARCHITECTURES[this.selectedPlatformName]?.link;
     },
+    registerInstructionsWithToken() {
+      const { registerInstructions } = this.instructions || {};
+
+      if (this.registrationToken) {
+        return registerInstructions.replace(REGISTRATION_TOKEN_PLACEHOLDER, this.registrationToken);
+      }
+
+      return registerInstructions;
+    },
   },
   methods: {
     show() {
@@ -249,11 +264,11 @@ export default {
           <pre
             class="gl-bg-gray gl-flex-grow-1 gl-white-space-pre-line"
             data-testid="register-command"
-            >{{ instructions.registerInstructions }}</pre
+            >{{ registerInstructionsWithToken }}</pre
           >
           <modal-copy-button
             :title="$options.i18n.copyInstructions"
-            :text="instructions.registerInstructions"
+            :text="registerInstructionsWithToken"
             :modal-id="$options.modalId"
             css-classes="gl-align-self-start gl-ml-2 gl-mt-2"
             category="tertiary"

app/assets/javascripts/work_items/graphql/provider.js

@@ -40,7 +40,7 @@ export function createApolloProvider() {
               type: 'TITLE',
               enabled: true,
               // eslint-disable-next-line @gitlab/require-i18n-strings
-              contentText: 'Test',
+              contentText: 'Test Work Item Title',
             },
           ],
         },

app/assets/javascripts/work_items/pages/work_item_root.vue

@@ -36,7 +36,11 @@ export default {
   <section>
     <!-- Title widget placeholder -->
     <div>
-      <h2 v-if="titleWidgetData" class="title" data-testid="title">
+      <h2
+        v-if="titleWidgetData"
+        class="gl-font-weight-normal gl-sm-font-weight-bold gl-my-5"
+        data-testid="title"
+      >
         {{ titleWidgetData.contentText }}
       </h2>
     </div>

app/assets/stylesheets/mailer.scss

@@ -143,6 +143,10 @@ table.content {
     line-height: 1.4;
     padding: 15px 5px;
     text-align: center;
+
+    ul.list-style-position-inside {
+      list-style-position: inside;
+    }
   }
 
   td.mailer-align-left {

app/controllers/groups_controller.rb

@@ -92,6 +92,7 @@ def show
         if @group.import_state&.in_progress?
           redirect_to group_import_path(@group)
         else
+          publish_invite_members_for_task_experiment
           render_show_html
         end
       end
@@ -379,6 +380,13 @@ def captcha_enabled?
   def captcha_required?
     captcha_enabled? && !params[:parent_id]
   end
+
+  def publish_invite_members_for_task_experiment
+    return unless params[:open_modal] == 'invite_members_for_task'
+    return unless current_user&.can?(:admin_group_member, @group)
+
+    experiment(:invite_members_for_task, namespace: @group).publish_to_client
+  end
 end
 
 GroupsController.prepend_mod_with('GroupsController')

app/controllers/projects/merge_requests_controller.rb

@@ -41,6 +41,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:diffs_virtual_scrolling, project, default_enabled: :yaml)
     push_frontend_feature_flag(:restructured_mr_widget, project, default_enabled: :yaml)
     push_frontend_feature_flag(:mr_changes_fluid_layout, project, default_enabled: :yaml)
+    push_frontend_feature_flag(:mr_attention_requests, project, default_enabled: :yaml)
 
     # Usage data feature flags
     push_frontend_feature_flag(:users_expanding_widgets_usage_data, @project, default_enabled: :yaml)

app/controllers/registrations/welcome_controller.rb

@@ -16,6 +16,8 @@ def update
       result = ::Users::SignupService.new(current_user, update_params).execute
 
       if result[:status] == :success
+        return redirect_to issues_dashboard_path(assignee_username: current_user.username) if show_tasks_to_be_done?
+
         return redirect_to experiment(:combined_registration, user: current_user).redirect_path(trial_params) if show_signup_onboarding?
 
         members = current_user.members
@@ -68,6 +70,12 @@ def show_signup_onboarding?
       false
     end
 
+    def show_tasks_to_be_done?
+      return unless experiment(:invite_members_for_task).enabled?
+
+      MemberTask.for_members(current_user.members).exists?
+    end
+
     def trial_params
       nil
     end

app/graphql/types/ci/runner_setup_type.rb

@@ -9,7 +9,7 @@ class RunnerSetupType < BaseObject
       field :install_instructions, GraphQL::Types::String, null: false,
         description: 'Instructions for installing the runner on the specified architecture.'
       field :register_instructions, GraphQL::Types::String, null: true,
-        description: 'Instructions for registering the runner.'
+        description: 'Instructions for registering the runner. The actual registration tokens are not included in the commands. Instead, a placeholder `$REGISTRATION_TOKEN` is shown.'
     end
   end
 end

app/helpers/invite_members_helper.rb

@@ -42,6 +42,14 @@ def common_invite_modal_dataset(source)
       e.candidate { dataset.merge!(areas_of_focus_options: member_areas_of_focus_options.to_json, no_selection_areas_of_focus: ['no_selection']) }
     end
 
+    if show_invite_members_for_task?
+      dataset.merge!(
+        tasks_to_be_done_options: tasks_to_be_done_options.to_json,
+        projects: projects_for_source(source).to_json,
+        new_project_path: source.is_a?(Group) ? new_project_path(namespace_id: source.id) : ''
+      )
+    end
+
     dataset
   end
 
@@ -71,4 +79,19 @@ def member_areas_of_focus_options
   def users_filter_data(group)
     {}
   end
+
+  def show_invite_members_for_task?
+    return unless current_user && experiment(:invite_members_for_task).enabled?
+
+    params[:open_modal] == 'invite_members_for_task'
+  end
+
+  def tasks_to_be_done_options
+    ::MemberTask::TASKS.keys.map { |task| { value: task, text: localized_tasks_to_be_done_choices[task] } }
+  end
+
+  def projects_for_source(source)
+    projects = source.is_a?(Project) ? [source] : source.projects
+    projects.map { |project| { id: project.id, title: project.title } }
+  end
 end

app/helpers/members_helper.rb

@@ -56,6 +56,14 @@ def member_path(member)
     end
   end
 
+  def localized_tasks_to_be_done_choices
+    {
+      code: s_('TasksToBeDone|Create/import code into a project (repository)'),
+      ci: s_('TasksToBeDone|Set up CI/CD pipelines to build, test, deploy, and monitor code'),
+      issues: s_('TasksToBeDone|Create/import issues (tickets) to collaborate on ideas and plan work')
+    }.freeze
+  end
+
   private
 
   def source_text(member)

app/models/ci/build.rb

@@ -313,12 +313,6 @@ def with_preloads
       end
 
       after_transition pending: :running do |build|
-        unless build.update_deployment_after_transaction_commit?
-          Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
-            build.deployment&.run
-          end
-        end
-
         build.run_after_commit do
           build.pipeline.persistent_ref.create
 
@@ -339,35 +333,12 @@ def with_preloads
       end
 
       after_transition any => [:success] do |build|
-        unless build.update_deployment_after_transaction_commit?
-          Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
-            build.deployment&.succeed
-          end
-        end
-
         build.run_after_commit do
           BuildSuccessWorker.perform_async(id)
           PagesWorker.perform_async(:deploy, id) if build.pages_generator?
         end
       end
 
-      after_transition any => [:failed] do |build|
-        next unless build.project
-        next unless build.deployment
-
-        unless build.update_deployment_after_transaction_commit?
-          begin
-            Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
-              build.deployment.drop!
-            end
-          rescue StandardError => e
-            Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, build_id: build.id)
-          end
-        end
-
-        true
-      end
-
       after_transition any => [:failed] do |build|
         next unless build.project
 
@@ -380,25 +351,12 @@ def with_preloads
         end
       end
 
-      after_transition any => [:skipped, :canceled] do |build, transition|
-        unless build.update_deployment_after_transaction_commit?
-          Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
-            if transition.to_name == :skipped
-              build.deployment&.skip
-            else
-              build.deployment&.cancel
-            end
-          end
-        end
-      end
-
       # Synchronize Deployment Status
       # Please note that the data integirty is not assured because we can't use
       # a database transaction due to DB decomposition.
       after_transition do |build, transition|
         next if transition.loopback?
         next unless build.project
-        next unless build.update_deployment_after_transaction_commit?
 
         build.run_after_commit do
           build.deployment&.sync_status_with(build)
@@ -1120,12 +1078,6 @@ def shared_runner_build?
       runner&.instance_type?
     end
 
-    def update_deployment_after_transaction_commit?
-      strong_memoize(:update_deployment_after_transaction_commit) do
-        Feature.enabled?(:update_deployment_after_transaction_commit, project, default_enabled: :yaml)
-      end
-    end
-
     protected
 
     def run_status_commit_hooks!

app/models/ci/runner.rb

@@ -103,7 +103,9 @@ class Runner < Ci::ApplicationRecord
       project_groups = ::Group.joins(:projects).where(projects: { id: project_id })
       hierarchy_groups = Gitlab::ObjectHierarchy.new(project_groups).base_and_ancestors
 
-      joins(:groups).where(namespaces: { id: hierarchy_groups })
+      joins(:groups)
+        .where(namespaces: { id: hierarchy_groups })
+        .allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/336433')
     }
 
     scope :owned_or_instance_wide, -> (project_id) do

app/models/concerns/merge_request_reviewer_state.rb

+# frozen_string_literal: true
+
+module MergeRequestReviewerState
+  extend ActiveSupport::Concern
+
+  included do
+    enum state: {
+      unreviewed: 0,
+      reviewed: 1,
+      attention_required: 2
+    }
+
+    validates :state,
+      presence: true,
+      inclusion: { in: self.states.keys }
+  end
+end

app/models/environment.rb

@@ -425,6 +425,14 @@ def clear_all_caches
     clear_reactive_cache!
   end
 
+  def should_link_to_merge_requests?
+    unfoldered? || production? || staging?
+  end
+
+  def unfoldered?
+    environment_type.nil?
+  end
+
   private
 
   def rollout_status_available?

app/models/group.rb

@@ -317,13 +317,15 @@ def owned_by?(user)
     owners.include?(user)
   end
 
-  def add_users(users, access_level, current_user: nil, expires_at: nil)
+  def add_users(users, access_level, current_user: nil, expires_at: nil, tasks_to_be_done: [], tasks_project_id: nil)
     Members::Groups::BulkCreatorService.add_users( # rubocop:disable CodeReuse/ServiceClass
       self,
       users,
       access_level,
       current_user: current_user,
-      expires_at: expires_at
+      expires_at: expires_at,
+      tasks_to_be_done: tasks_to_be_done,
+      tasks_project_id: tasks_project_id
     )
   end
 

app/models/integrations/jira.rb

@@ -302,6 +302,14 @@ def issue_transition_enabled?
 
     private
 
+    def branch_name(noteable)
+      if Feature.enabled?(:jira_use_first_ref_by_oid, project, default_enabled: :yaml)
+        noteable.first_ref_by_oid(project.repository)
+      else
+        noteable.ref_names(project.repository).first
+      end
+    end
+
     def server_info
       strong_memoize(:server_info) do
         client_url.present? ? jira_request { client.ServerInfo.all.attrs } : nil
@@ -495,7 +503,7 @@ def build_entity_meta(noteable)
         {
           id: noteable.short_id,
           description: noteable.safe_message,
-          branch: noteable.ref_names(project.repository).first
+          branch: branch_name(noteable)
         }
       elsif noteable.is_a?(MergeRequest)
         {

app/models/legacy_diff_note.rb

@@ -13,7 +13,7 @@ class LegacyDiffNote < Note
 
   validates :line_code, presence: true, line_code: true
 
-  before_create :set_diff
+  before_create :set_diff, unless: :skip_setting_st_diff?
 
   def discussion_class(*)
     LegacyDiffDiscussion
@@ -90,6 +90,10 @@ def set_diff
     self.st_diff = diff.to_hash if diff
   end
 
+  def skip_setting_st_diff?
+    st_diff.present? && importing? && Feature.enabled?(:skip_legacy_diff_note_callback_on_import, default_enabled: :yaml)
+  end
+
   def diff_for_line_code
     attributes = {
       noteable_type: noteable_type,

app/models/member.rb

@@ -13,6 +13,7 @@ class Member < ApplicationRecord
   include FromUnion
   include UpdateHighestRole
   include RestrictedSignup
+  include Gitlab::Experiment::Dsl
 
   AVATAR_SIZE = 40
   ACCESS_REQUEST_APPROVERS_TO_BE_NOTIFIED_LIMIT = 10
@@ -22,8 +23,10 @@ class Member < ApplicationRecord
   belongs_to :created_by, class_name: "User"
   belongs_to :user
   belongs_to :source, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
+  has_one :member_task
 
   delegate :name, :username, :email, to: :user, prefix: true
+  delegate :tasks_to_be_done, to: :member_task, allow_nil: true
 
   validates :expires_at, allow_blank: true, future_date: true
   validates :user, presence: true, unless: :invite?
@@ -413,6 +416,14 @@ def refresh_member_authorized_projects(blocking:)
 
   def after_accept_invite
     post_create_hook
+
+    if experiment(:invite_members_for_task).enabled?
+      run_after_commit_or_now do
+        if member_task
+          TasksToBeDone::CreateWorker.perform_async(member_task.id, created_by_id, [user_id.to_i])
+        end
+      end
+    end
   end
 
   def after_decline_invite

app/models/members/member_task.rb

+# frozen_string_literal: true
+
+class MemberTask < ApplicationRecord
+  TASKS = {
+    code: 0,
+    ci: 1,
+    issues: 2
+  }.freeze
+
+  belongs_to :member
+  belongs_to :project
+
+  validates :member, :project, presence: true
+  validates :tasks, inclusion: { in: TASKS.values }
+  validate :tasks_uniqueness
+  validate :project_in_member_source
+
+  scope :for_members, -> (members) { joins(:member).where(member: members) }
+
+  def tasks_to_be_done
+    Array(self[:tasks]).map { |task| TASKS.key(task) }
+  end
+
+  def tasks_to_be_done=(tasks)
+    self[:tasks] = Array(tasks).map do |task|
+      TASKS[task.to_sym]
+    end.uniq
+  end
+
+  private
+
+  def tasks_uniqueness
+    errors.add(:tasks, 'are not unique') unless Array(tasks).length == Array(tasks).uniq.length
+  end
+
+  def project_in_member_source
+    if member.is_a?(GroupMember)
+      errors.add(:project, _('is not in the member group')) unless project.namespace == member.source
+    elsif member.is_a?(ProjectMember)
+      errors.add(:project, _('is not the member project')) unless project == member.source
+    end
+  end
+end