Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/projects/default_project_templates.js

@@ -137,4 +137,8 @@ export default {
     text: s__('ProjectTemplates|NIST 800-53r5'),
     icon: '.template-option .icon-gitlab_logo',
   },
+  gitlab_components: {
+    text: s__('ProjectTemplates|GitLab CI/CD components'),
+    icon: '.template-option .icon-gitlab_logo',
+  },
 };

app/services/notification_service.rb

@@ -437,38 +437,6 @@ def new_note(note)
     send_service_desk_notification(note)
   end
 
-  def send_new_note_notifications(note)
-    notify_method = "note_#{note.noteable_ability_name}_email".to_sym
-
-    recipients = NotificationRecipients::BuildService.build_new_note_recipients(note)
-    recipients.each do |recipient|
-      mailer.send(notify_method, recipient.user.id, note.id, recipient.reason).deliver_later
-    end
-  end
-
-  def send_service_desk_notification(note)
-    return unless note.noteable_type == 'Issue'
-    return if note.confidential
-    return unless note.project && ::ServiceDesk.enabled?(note.project)
-
-    issue = note.noteable
-    recipients = issue.issue_email_participants
-
-    return unless recipients.any?
-
-    # Only populated if note is from external participant
-    note_external_author = note.note_metadata&.email_participant&.downcase
-
-    recipients.each do |recipient|
-      # Don't send Service Desk notification if the recipient is the author of the note.
-      # We store emails as-is but compare downcased versions.
-      next if recipient.email.downcase == note_external_author
-
-      mailer.service_desk_new_note_email(issue.id, note.id, recipient).deliver_later
-      Gitlab::Metrics::BackgroundTransaction.current&.add_event(:service_desk_new_note_email)
-    end
-  end
-
   # Notify users when a new release is created
   def send_new_release_notifications(release)
     unless release.author&.can_trigger_notifications?
@@ -895,6 +863,38 @@ def mailer
 
   private
 
+  def send_new_note_notifications(note)
+    notify_method = "note_#{note.noteable_ability_name}_email".to_sym
+
+    recipients = NotificationRecipients::BuildService.build_new_note_recipients(note)
+    recipients.each do |recipient|
+      mailer.send(notify_method, recipient.user.id, note.id, recipient.reason).deliver_later
+    end
+  end
+
+  def send_service_desk_notification(note)
+    return unless note.noteable_type == 'Issue'
+    return if note.confidential
+    return unless note.project && ::ServiceDesk.enabled?(note.project)
+
+    issue = note.noteable
+    recipients = issue.issue_email_participants
+
+    return unless recipients.any?
+
+    # Only populated if note is from external participant
+    note_external_author = note.note_metadata&.email_participant&.downcase
+
+    recipients.each do |recipient|
+      # Don't send Service Desk notification if the recipient is the author of the note.
+      # We store emails as-is but compare downcased versions.
+      next if recipient.email.downcase == note_external_author
+
+      mailer.service_desk_new_note_email(issue.id, note.id, recipient).deliver_later
+      Gitlab::Metrics::BackgroundTransaction.current&.add_event(:service_desk_new_note_email)
+    end
+  end
+
   def owners_without_invites(project)
     recipients = project.members.active_without_invites_and_requests.owners
 

app/services/todo_service.rb

@@ -224,19 +224,6 @@ def resolve_todos_for_target(target, current_user)
     GraphqlTriggers.issuable_todo_updated(target)
   end
 
-  # Resolves all todos related to target for all users
-  def resolve_todos_with_attributes_for_target(target, attributes, resolution: :done, resolved_by_action: :system_done)
-    target_attributes = { target_id: target.id, target_type: target.class.polymorphic_name }
-    attributes.merge!(target_attributes)
-    attributes[:preload_user_association] = true
-
-    todos = PendingTodosFinder.new(attributes).execute
-    users = todos.map(&:user)
-    todos_ids = todos.batch_update(state: resolution, resolved_by_action: resolved_by_action)
-    users.each(&:update_todos_count_cache)
-    todos_ids
-  end
-
   def resolve_todos(todos, current_user, resolution: :done, resolved_by_action: :system_done)
     todos_ids = todos.batch_update(state: resolution, resolved_by_action: resolved_by_action, snoozed_until: nil)
 
@@ -321,6 +308,19 @@ def create_review_submitted_todo(target, review_author)
 
   private
 
+  # Resolves all todos related to target for all users
+  def resolve_todos_with_attributes_for_target(target, attributes, resolution: :done, resolved_by_action: :system_done)
+    target_attributes = { target_id: target.id, target_type: target.class.polymorphic_name }
+    attributes.merge!(target_attributes)
+    attributes[:preload_user_association] = true
+
+    todos = PendingTodosFinder.new(attributes).execute
+    users = todos.map(&:user)
+    todos_ids = todos.batch_update(state: resolution, resolved_by_action: resolved_by_action)
+    users.each(&:update_todos_count_cache)
+    todos_ids
+  end
+
   def create_todos(users, attributes, namespace, project)
     users = Array(users)
 

bin/secpick

@@ -195,7 +195,7 @@ module Secpick
       [
         "-o mr.create",
         "-o mr.target='#{stable_branch}'",
-        "-o mr.description='Please apply Security Release template. /milestone %#{milestone}'"
+        "-o mr.description='Please apply Security Release template.\\n/milestone %#{milestone}'"
       ]
     end
 

data/deprecations/15-9-insecure-ci-job-token.yml

@@ -10,7 +10,7 @@
   scope: project  # Can be one or a combination of: [instance, group, project]
   reporter: jocelynjane  # (required) GitLab username of the person reporting the deprecation
   stage: Software Supply Chain Security  # (required) String value of the stage that the feature was created in. e.g., Growth
-  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383084  # (required) Link to the deprecation issue in GitLab
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395708  # (required) Link to the deprecation issue in GitLab
   check_impact: Refer to the [Understanding this change](https://gitlab.com/gitlab-org/gitlab/-/issues/395708#understanding-this-change) section for details.
   body: |  # (required) Do not modify this line, instead modify the lines below.
     In GitLab 14.4, we introduced a setting to [limit access _from_ your project's CI/CD job tokens (`CI_JOB_TOKEN`)](https://docs.gitlab.com/ci/jobs/ci_job_token/#limit-your-projects-job-token-access) to make it more secure.

db/docs/batched_background_migrations/backfill_missing_namespace_id_on_notes.yml

@@ -1329,7 +1329,7 @@ This migration tool will be removed in GitLab 18.3.
 
 - Announced in GitLab <span class="milestone">15.9</span>
 - Removal in GitLab <span class="milestone">18.0</span> ([breaking change](https://docs.gitlab.com/update/terminology/#breaking-change))
-- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/383084).
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/395708).
 
 </div>
 

doc/update/deprecations.md

@@ -85,7 +85,8 @@ def localized_templates_table
           ProjectTemplate.new('kotlin_native_linux', 'Kotlin Native Linux', _('A basic template for developing Linux programs using Kotlin Native'), 'https://gitlab.com/gitlab-org/project-templates/kotlin-native-linux'),
           ProjectTemplate.new('typo3_distribution', 'TYPO3 Distribution', _('A template for starting a new TYPO3 project'), 'https://gitlab.com/gitlab-org/project-templates/typo3-distribution', 'illustrations/logos/typo3.svg'),
           ProjectTemplate.new('laravel', 'Laravel Framework', _('A basic folder structure of a Laravel application, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/laravel', 'illustrations/logos/laravel.svg'),
-          ProjectTemplate.new('nist_80053r5', 'NIST 800-53r5', _('A project containing issues for security and privacy controls published by the U.S. National Institute of Standards and Technology'), 'https://gitlab.com/gitlab-org/project-templates/nist_80053r5')
+          ProjectTemplate.new('nist_80053r5', 'NIST 800-53r5', _('A project containing issues for security and privacy controls published by the U.S. National Institute of Standards and Technology'), 'https://gitlab.com/gitlab-org/project-templates/nist_80053r5'),
+          ProjectTemplate.new('gitlab_components', 'GitLab CI/CD components', _('A basic folder structure and sample files for a CI/CD components project.'), 'https://gitlab.com/gitlab-org/project-templates/gitlab-component-template')
         ]
       end
       # rubocop:enable Metrics/AbcSize

lib/gitlab/project_template.rb

@@ -2134,6 +2134,9 @@ msgstr ""
 msgid "A Let's Encrypt SSL certificate can not be obtained until your domain is verified."
 msgstr ""
 
+msgid "A basic folder structure and sample files for a CI/CD components project."
+msgstr ""
+
 msgid "A basic folder structure of a Laravel application, to help you get started."
 msgstr ""
 
@@ -48142,6 +48145,9 @@ msgstr ""
 msgid "ProjectTemplates|Android"
 msgstr ""
 
+msgid "ProjectTemplates|GitLab CI/CD components"
+msgstr ""
+
 msgid "ProjectTemplates|GitLab Cluster Management"
 msgstr ""
 

locale/gitlab.pot

@@ -11,7 +11,7 @@ gem 'capybara', '~> 3.40.0'
 gem 'capybara-screenshot', '~> 1.0.26'
 gem 'rake', '~> 13', '>= 13.2.1'
 gem 'rspec', '~> 3.13'
-gem 'selenium-webdriver', '= 4.31.0'
+gem 'selenium-webdriver', '= 4.32.0'
 gem 'rest-client', '~> 2.1.0'
 gem 'rspec_junit_formatter', '~> 0.6.0'
 gem 'faker', '~> 3.5', '>= 3.5.1'

qa/Gemfile

@@ -316,7 +316,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    selenium-webdriver (4.31.0)
+    selenium-webdriver (4.32.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -401,7 +401,7 @@ DEPENDENCIES
   rspec-parameterized (~> 1.0.2)
   rspec_junit_formatter (~> 0.6.0)
   ruby-debug-ide (~> 0.7.5)
-  selenium-webdriver (= 4.31.0)
+  selenium-webdriver (= 4.32.0)
   slack-notifier (~> 2.4)
   terminal-table (~> 4.0.0)
   warning (~> 1.5)

qa/Gemfile.lock

@@ -375,39 +375,6 @@
       end
     end
 
-    describe '#resolve_todos_with_attributes_for_target' do
-      it 'marks related pending todos to the target for all the users as done' do
-        first_todo = create(:todo, :assigned, user: member, project: project, target: issue, author: author)
-        second_todo = create(:todo, :review_requested, user: john_doe, project: project, target: issue, author: author)
-        another_todo = create(:todo, :assigned, user: john_doe, project: project, target: project, author: author)
-
-        service.resolve_todos_with_attributes_for_target(issue, {})
-
-        expect(first_todo.reload).to be_done
-        expect(second_todo.reload).to be_done
-        expect(another_todo.reload).to be_pending
-      end
-
-      it 'marks related only filtered pending todos to the target for all the users as done' do
-        first_todo = create(:todo, :assigned, user: member, project: project, target: issue, author: author)
-        second_todo = create(:todo, :review_requested, user: john_doe, project: project, target: issue, author: author)
-        another_todo = create(:todo, :assigned, user: john_doe, project: project, target: project, author: author)
-
-        service.resolve_todos_with_attributes_for_target(issue, { action: Todo::ASSIGNED })
-
-        expect(first_todo.reload).to be_done
-        expect(second_todo.reload).to be_pending
-        expect(another_todo.reload).to be_pending
-      end
-
-      it 'fetches the pending todos with users preloaded' do
-        expect(PendingTodosFinder).to receive(:new)
-          .with(a_hash_including(preload_user_association: true)).and_call_original
-
-        service.resolve_todos_with_attributes_for_target(issue, { action: Todo::ASSIGNED })
-      end
-    end
-
     describe '#new_note' do
       let!(:first_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
       let!(:second_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
@@ -1512,6 +1479,13 @@
       expect(another_pending_todo.reload).to be_pending
       expect(another_project_todo.reload).to be_pending
     end
+
+    it 'fetches the pending todos with users preloaded' do
+      expect(PendingTodosFinder).to receive(:new)
+                                      .with(a_hash_including(preload_user_association: true)).and_call_original
+
+      service.resolve_access_request_todos(project_requester)
+    end
   end
 
   describe '#restore_todo' do

spec/services/todo_service_spec.rb

@@ -10,7 +10,7 @@ def all_templates
       serverless_framework tencent_serverless_framework
       jsonnet cluster_management kotlin_native_linux
       pelican bridgetown typo3_distribution laravel
-      nist_80053r5
+      nist_80053r5 gitlab_components
     ]
   end
 end