Merge branch 'correcting-overridden-typos-in-the-codebase' into 'master'

Correcting several instances of 'overridden' being misspelled

See merge request gitlab-org/gitlab!36246

app/helpers/search_helper.rb

@@ -62,7 +62,7 @@ module SearchHelper
     }).html_safe
   end
 
-  # Overriden in EE
+  # Overridden in EE
   def search_blob_title(project, path)
     path
   end

app/models/concerns/has_repository.rb

@@ -5,7 +5,7 @@
 # of directly having a repository, like project or snippet.
 #
 # It also includes `Referable`, therefore the method
-# `to_reference` should be overriden in case the object
+# `to_reference` should be overridden in case the object
 # needs any special behavior.
 module HasRepository
   extend ActiveSupport::Concern

app/presenters/clusterable_presenter.rb

@@ -65,7 +65,7 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
     raise NotImplementedError
   end
 
-  # Will be overidden in EE
+  # Will be overridden in EE
   def environments_cluster_path(cluster)
     nil
   end

app/services/users/block_service.rb

@@ -19,7 +19,7 @@ module Users
     private
 
     def after_block_hook(user)
-      # overriden by EE module
+      # overridden by EE module
     end
   end
 end

ee/app/finders/merge_requests/by_approvers_finder.rb

@@ -80,9 +80,9 @@ module MergeRequests
       users_mrs = yield(items.joins(approval_rules: :users))
       group_users_mrs = yield(items.joins(approval_rules: { groups: :users }))
 
-      mrs_without_overriden_rules = items.left_outer_joins(:approval_rules).where(approval_merge_request_rules: { id: nil })
-      project_users_mrs = yield(mrs_without_overriden_rules.joins(target_project: { approval_rules: :users }))
-      project_group_users_mrs = yield(mrs_without_overriden_rules.joins(target_project: { approval_rules: { groups: :users } }))
+      mrs_without_overridden_rules = items.left_outer_joins(:approval_rules).where(approval_merge_request_rules: { id: nil })
+      project_users_mrs = yield(mrs_without_overridden_rules.joins(target_project: { approval_rules: :users }))
+      project_group_users_mrs = yield(mrs_without_overridden_rules.joins(target_project: { approval_rules: { groups: :users } }))
 
       items.select_from_union([users_mrs, group_users_mrs, project_users_mrs, project_group_users_mrs])
     end

ee/lib/gitlab/geo/log_helpers.rb

@@ -29,7 +29,7 @@ module Gitlab
         }.merge(extra_log_data).compact
       end
 
-      # Intended to be overidden elsewhere
+      # Intended to be overridden elsewhere
       def extra_log_data
         {}
       end

lib/gitlab/ci/config.rb

@@ -93,7 +93,7 @@ module Gitlab
         Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error, @context.sentry_payload)
       end
 
-      # Overriden in EE
+      # Overridden in EE
       def rescue_errors
         RESCUE_ERRORS
       end

lib/gitlab/file_finder.rb

@@ -42,7 +42,7 @@ module Gitlab
       end
     end
 
-    # Overriden in Gitlab::WikiFileFinder
+    # Overridden in Gitlab::WikiFileFinder
     def search_paths(query)
       repository.search_files_by_name(query, ref)
     end

spec/frontend/monitoring/components/dashboard_panel_spec.js

@@ -369,7 +369,7 @@ describe('Dashboard Panel', () => {
       });
     });
 
-    it('it is overriden when a datazoom event is received', () => {
+    it('it is overridden when a datazoom event is received', () => {
       state.logsPath = mockLogsPath;
       state.timeRange = mockTimeRange;
 

spec/lib/gitlab/lograge/custom_options_spec.rb

@@ -65,14 +65,14 @@ RSpec.describe Gitlab::Lograge::CustomOptions do
       end
     end
 
-    context 'when correlation_id is overriden' do
+    context 'when correlation_id is overridden' do
       let(:correlation_id_key) { Labkit::Correlation::CorrelationId::LOG_KEY }
 
       before do
         event_payload[correlation_id_key] = '123456'
       end
 
-      it 'sets the overriden value' do
+      it 'sets the overridden value' do
         expect(subject[correlation_id_key]).to eq('123456')
       end
     end

spec/models/concerns/reactive_caching_spec.rb

@@ -298,7 +298,7 @@ RSpec.describe ReactiveCaching, :use_clean_rails_memory_store_caching do
             expect(read_reactive_cache(instance)).not_to eq(calculation.call)
           end
 
-          context 'when reactive_cache_limit_enabled? is overriden to return false' do
+          context 'when reactive_cache_limit_enabled? is overridden to return false' do
             before do
               allow(instance).to receive(:reactive_cache_limit_enabled?).and_return(false)
             end

spec/models/personal_access_token_spec.rb

@@ -204,7 +204,7 @@ RSpec.describe PersonalAccessToken do
   end
 
   describe '.simple_sorts' do
-    it 'includes overriden keys' do
+    it 'includes overridden keys' do
       expect(described_class.simple_sorts.keys).to include(*%w(expires_at_asc expires_at_desc))
     end
   end