GITALY_SERVER_VERSION

-1.83.0
+1.85.0

Gemfile

@@ -456,7 +456,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.81.0'
+gem 'gitaly', '~> 1.85.0'
 
 gem 'grpc', '~> 1.24.0'
 

Gemfile.lock

@@ -360,7 +360,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     git (1.5.0)
-    gitaly (1.81.0)
+    gitaly (1.85.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
@@ -1209,7 +1209,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 1.81.0)
+  gitaly (~> 1.85.0)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-labkit (= 0.9.1)

Guardfile

@@ -2,7 +2,7 @@
 
 # More info at https://github.com/guard/guard#readme
 
-cmd = ENV['SPRING'] ? 'spring rspec' : 'bundle exec rspec'
+cmd = ENV['GUARD_CMD'] || (ENV['SPRING'] ? 'spring rspec' : 'bundle exec rspec')
 
 guard :rspec, cmd: cmd do
   require "guard/rspec/dsl"

app/assets/javascripts/clusters/components/applications.vue

@@ -129,9 +129,6 @@ export default {
     crossplaneInstalled() {
       return this.applications.crossplane.status === APPLICATION_STATUS.INSTALLED;
     },
-    enableClusterApplicationElasticStack() {
-      return gon.features && gon.features.enableClusterApplicationElasticStack;
-    },
     ingressModSecurityDescription() {
       const escapedUrl = _.escape(this.ingressModSecurityHelpPath);
 
@@ -655,7 +652,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
         </div>
       </application-row>
       <application-row
-        v-if="enableClusterApplicationElasticStack"
         id="elastic_stack"
         :logo-url="elasticStackLogo"
         :title="applications.elastic_stack.title"

app/assets/javascripts/registry/settings/components/settings_form.vue

@@ -10,6 +10,7 @@ import {
   GlLoadingIcon,
 } from '@gitlab/ui';
 import { s__, __, sprintf } from '~/locale';
+import Tracking from '~/tracking';
 import {
   NAME_REGEX_LENGTH,
   UPDATE_SETTINGS_ERROR_MESSAGE,
@@ -27,10 +28,18 @@ export default {
     GlCard,
     GlLoadingIcon,
   },
+  mixins: [Tracking.mixin()],
   labelsConfig: {
     cols: 3,
     align: 'right',
   },
+  data() {
+    return {
+      tracking: {
+        label: 'docker_container_retention_and_expiration_policies',
+      },
+    };
+  },
   computed: {
     ...mapState(['formOptions', 'isLoading']),
     ...mapComputed(
@@ -86,7 +95,12 @@ export default {
   },
   methods: {
     ...mapActions(['resetSettings', 'saveSettings']),
+    reset() {
+      this.track('reset_form');
+      this.resetSettings();
+    },
     submit() {
+      this.track('submit_form');
       this.saveSettings()
         .then(() => this.$toast.show(UPDATE_SETTINGS_SUCCESS_MESSAGE, { type: 'success' }))
         .catch(() => this.$toast.show(UPDATE_SETTINGS_ERROR_MESSAGE, { type: 'error' }));
@@ -96,7 +110,7 @@ export default {
 </script>
 
 <template>
-  <form ref="form-element" @submit.prevent="submit" @reset.prevent="resetSettings">
+  <form ref="form-element" @submit.prevent="submit" @reset.prevent="reset">
     <gl-card>
       <template #header>
         {{ s__('ContainerRegistry|Tag expiration policy') }}

app/assets/javascripts/repository/components/breadcrumbs.vue

@@ -107,10 +107,16 @@ export default {
             return acc.concat({
               name,
               path,
-              to: `/-/tree/${this.ref}${path}`,
+              to: `/-/tree/${escape(this.ref)}${path}`,
             });
           },
-          [{ name: this.projectShortPath, path: '/', to: `/-/tree/${this.ref}/` }],
+          [
+            {
+              name: this.projectShortPath,
+              path: '/',
+              to: `/-/tree/${escape(this.ref)}/`,
+            },
+          ],
         );
     },
     canCreateMrFromFork() {

app/assets/javascripts/repository/components/table/parent_row.vue

@@ -28,7 +28,7 @@ export default {
       return splitArray.join('/');
     },
     parentRoute() {
-      return { path: `/-/tree/${this.commitRef}/${this.parentPath}` };
+      return { path: `/-/tree/${escape(this.commitRef)}/${this.parentPath}` };
     },
   },
   methods: {

app/assets/javascripts/repository/components/table/row.vue

@@ -90,7 +90,7 @@ export default {
   },
   computed: {
     routerLinkTo() {
-      return this.isFolder ? { path: `/-/tree/${this.ref}/${this.path}` } : null;
+      return this.isFolder ? { path: `/-/tree/${escape(this.ref)}/${this.path}` } : null;
     },
     iconName() {
       return `fa-${getIconName(this.type, this.path)}`;

app/assets/javascripts/repository/log_tree.js

@@ -27,7 +27,10 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
 
   fetchpromise = axios
     .get(
-      `${gon.relative_url_root}/${projectPath}/-/refs/${ref}/logs_tree/${path.replace(/^\//, '')}`,
+      `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${path.replace(
+        /^\//,
+        '',
+      )}`,
       {
         params: { format: 'json', offset },
       },

app/assets/javascripts/repository/router.js

@@ -12,7 +12,7 @@ export default function createRouter(base, baseRef) {
     base: joinPaths(gon.relative_url_root || '', base),
     routes: [
       {
-        path: `/-/tree/${baseRef}(/.*)?`,
+        path: `/-/tree/${escape(baseRef)}(/.*)?`,
         name: 'treePath',
         component: TreePage,
         props: route => ({

app/controllers/admin/application_settings_controller.rb

@@ -3,7 +3,13 @@
 class Admin::ApplicationSettingsController < Admin::ApplicationController
   include InternalRedirect
 
+  # NOTE: Use @application_setting in this controller when you need to access
+  # application_settings after it has been modified. This is because the
+  # ApplicationSetting model uses Gitlab::ThreadMemoryCache for caching and the
+  # cache might be stale immediately after an update.
+  # https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30233
   before_action :set_application_setting
+
   before_action :whitelist_query_limiting, only: [:usage_data]
   before_action :validate_self_monitoring_feature_flag_enabled, only: [
     :create_self_monitoring_project,
@@ -79,6 +85,7 @@ def lets_encrypt_terms_of_service
     redirect_to ::Gitlab::LetsEncrypt.terms_of_service_url
   end
 
+  # Specs are in spec/requests/self_monitoring_project_spec.rb
   def create_self_monitoring_project
     job_id = SelfMonitoringProjectCreateWorker.perform_async
 
@@ -88,6 +95,7 @@ def create_self_monitoring_project
     }
   end
 
+  # Specs are in spec/requests/self_monitoring_project_spec.rb
   def status_create_self_monitoring_project
     job_id = params[:job_id].to_s
 
@@ -98,10 +106,7 @@ def status_create_self_monitoring_project
       }
     end
 
-    if Gitlab::CurrentSettings.self_monitoring_project_id.present?
-      return render status: :ok, json: self_monitoring_data
-
-    elsif SelfMonitoringProjectCreateWorker.in_progress?(job_id)
+    if SelfMonitoringProjectCreateWorker.in_progress?(job_id)
       ::Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
       return render status: :accepted, json: {
@@ -109,12 +114,17 @@ def status_create_self_monitoring_project
       }
     end
 
+    if @application_setting.self_monitoring_project_id.present?
+      return render status: :ok, json: self_monitoring_data
+    end
+
     render status: :bad_request, json: {
       message: _('Self-monitoring project does not exist. Please check logs ' \
         'for any error messages')
     }
   end
 
+  # Specs are in spec/requests/self_monitoring_project_spec.rb
   def delete_self_monitoring_project
     job_id = SelfMonitoringProjectDeleteWorker.perform_async
 
@@ -124,6 +134,7 @@ def delete_self_monitoring_project
     }
   end
 
+  # Specs are in spec/requests/self_monitoring_project_spec.rb
   def status_delete_self_monitoring_project
     job_id = params[:job_id].to_s
 
@@ -134,12 +145,7 @@ def status_delete_self_monitoring_project
       }
     end
 
-    if Gitlab::CurrentSettings.self_monitoring_project_id.nil?
-      return render status: :ok, json: {
-        message: _('Self-monitoring project has been successfully deleted')
-      }
-
-    elsif SelfMonitoringProjectDeleteWorker.in_progress?(job_id)
+    if SelfMonitoringProjectDeleteWorker.in_progress?(job_id)
       ::Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
       return render status: :accepted, json: {
@@ -147,6 +153,12 @@ def status_delete_self_monitoring_project
       }
     end
 
+    if @application_setting.self_monitoring_project_id.nil?
+      return render status: :ok, json: {
+        message: _('Self-monitoring project has been successfully deleted')
+      }
+    end
+
     render status: :bad_request, json: {
       message: _('Self-monitoring project was not deleted. Please check logs ' \
         'for any error messages')
@@ -161,8 +173,8 @@ def validate_self_monitoring_feature_flag_enabled
 
   def self_monitoring_data
     {
-      project_id: Gitlab::CurrentSettings.self_monitoring_project_id,
-      project_full_path: Gitlab::CurrentSettings.self_monitoring_project&.full_path
+      project_id: @application_setting.self_monitoring_project_id,
+      project_full_path: @application_setting.self_monitoring_project&.full_path
     }
   end
 

app/controllers/admin/spam_logs_controller.rb

@@ -24,7 +24,7 @@ def destroy
   def mark_as_ham
     spam_log = SpamLog.find(params[:id])
 
-    if HamService.new(spam_log).mark_as_ham!
+    if Spam::HamService.new(spam_log).mark_as_ham!
       redirect_to admin_spam_logs_path, notice: _('Spam log successfully submitted as ham.')
     else
       redirect_to admin_spam_logs_path, alert: _('Error with Akismet. Please check the logs for more info.')

app/controllers/clusters/clusters_controller.rb

@@ -12,9 +12,6 @@ class Clusters::ClustersController < Clusters::BaseController
   before_action :authorize_update_cluster!, only: [:update]
   before_action :authorize_admin_cluster!, only: [:destroy, :clear_cache]
   before_action :update_applications_status, only: [:cluster_status]
-  before_action only: [:show] do
-    push_frontend_feature_flag(:enable_cluster_application_elastic_stack)
-  end
 
   helper_method :token_in_session
 

app/controllers/projects/merge_requests/diffs_controller.rb

@@ -64,6 +64,10 @@ def render_diffs
 
     options = additional_attributes.merge(diff_view: diff_view)
 
+    if @merge_request.project.context_commits_enabled?
+      options[:context_commits] = @merge_request.context_commits
+    end
+
     render json: DiffsSerializer.new(request).represent(diffs, options)
   end
 

app/controllers/projects/merge_requests_controller.rb

@@ -116,6 +116,15 @@ def pipelines
     }
   end
 
+  def context_commits
+    return render_404 unless project.context_commits_enabled?
+
+    # Get commits from repository
+    # or from cache if already merged
+    commits = ContextCommitsFinder.new(project, @merge_request, { search: params[:search], limit: params[:limit], offset: params[:offset] }).execute
+    render json: CommitEntity.represent(commits, { type: :full, request: merge_request })
+  end
+
   def test_reports
     reports_response(@merge_request.compare_test_reports)
   end

app/controllers/projects/repositories_controller.rb

@@ -81,7 +81,7 @@ def assign_append_sha
 
   def assign_archive_vars
     if params[:id]
-      @ref, @filename = extract_ref(params[:id])
+      @ref, @filename = extract_ref_and_filename(params[:id])
     else
       @ref = params[:ref]
       @filename = nil
@@ -89,6 +89,26 @@ def assign_archive_vars
   rescue InvalidPathError
     render_404
   end
+
+  # path can be of the form:
+  # master
+  # master/first.zip
+  # master/first/second.tar.gz
+  # master/first/second/third.zip
+  #
+  # In the archive case, we know that the last value is always the filename, so we
+  # do a greedy match to extract the ref. This avoid having to pull all ref names
+  # from Redis.
+  def extract_ref_and_filename(id)
+    path = id.strip
+    data = path.match(/(.*)\/(.*)/)
+
+    if data
+      [data[1], data[2]]
+    else
+      [path, nil]
+    end
+  end
 end
 
 Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')

app/finders/context_commits_finder.rb

+# frozen_string_literal: true
+
+class ContextCommitsFinder
+  def initialize(project, merge_request, params = {})
+    @project = project
+    @merge_request = merge_request
+    @search = params[:search]
+    @limit = (params[:limit] || 40).to_i
+    @offset = (params[:offset] || 0).to_i
+  end
+
+  def execute
+    commits = init_collection
+    commits = filter_existing_commits(commits)
+
+    commits
+  end
+
+  private
+
+  attr_reader :project, :merge_request, :search, :limit, :offset
+
+  def init_collection
+    commits =
+      if search.present?
+        search_commits
+      else
+        project.repository.commits(merge_request.source_branch, { limit: limit, offset: offset })
+      end
+
+    commits
+  end
+
+  def filter_existing_commits(commits)
+    commits.select! { |commit| already_included_ids.exclude?(commit.id) }
+
+    commits
+  end
+
+  def search_commits
+    key = search.strip
+    commits = []
+    if Commit.valid_hash?(key)
+      mr_existing_commits_ids = merge_request.commits.map(&:id)
+      if mr_existing_commits_ids.exclude? key
+        commit_by_sha = project.repository.commit(key)
+        commits = [commit_by_sha] if commit_by_sha
+      end
+    else
+      commits = project.repository.find_commits_by_message(search, nil, nil, 20)
+    end
+
+    commits
+  end
+
+  def already_included_ids
+    mr_existing_commits_ids = merge_request.commits.map(&:id)
+    mr_context_commits_ids = merge_request.context_commits.map(&:id)
+
+    mr_existing_commits_ids + mr_context_commits_ids
+  end
+end

app/graphql/resolvers/error_tracking/sentry_detailed_error_resolver.rb

@@ -8,7 +8,6 @@ class SentryDetailedErrorResolver < BaseResolver
                 description: 'ID of the Sentry issue'
 
       def resolve(**args)
-        project = object
         current_user = context[:current_user]
         issue_id = GlobalID.parse(args[:id]).model_id
 
@@ -23,6 +22,14 @@ def resolve(**args)
 
         issue
       end
+
+      private
+
+      def project
+        return object.gitlab_project if object.respond_to?(:gitlab_project)
+
+        object
+      end
     end
   end
 end