Commit dcc24b4a authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'pb-remove-dangling-database-offenses' into 'master'

Remove dangling todos for multi-database offenses

See merge request gitlab-org/gitlab!78104
parents 8e93523b 2b8a31aa
--- ---
Database/MultipleDatabases: Database/MultipleDatabases:
Exclude: Exclude:
- ee/lib/ee/gitlab/database.rb
- ee/lib/gitlab/geo/database_tasks.rb - ee/lib/gitlab/geo/database_tasks.rb
- ee/lib/gitlab/geo/geo_tasks.rb - ee/lib/gitlab/geo/geo_tasks.rb
- ee/lib/gitlab/geo/health_check.rb - ee/lib/gitlab/geo/health_check.rb
- ee/lib/gitlab/geo/log_cursor/daemon.rb - ee/lib/gitlab/geo/log_cursor/daemon.rb
- ee/lib/pseudonymizer/dumper.rb - ee/lib/pseudonymizer/dumper.rb
- ee/lib/pseudonymizer/pager.rb - ee/lib/pseudonymizer/pager.rb
- ee/lib/system_check/geo/geo_database_configured_check.rb
- ee/spec/lib/pseudonymizer/dumper_spec.rb - ee/spec/lib/pseudonymizer/dumper_spec.rb
- ee/spec/services/ee/merge_requests/update_service_spec.rb - ee/spec/services/ee/merge_requests/update_service_spec.rb
- lib/backup/database.rb - lib/backup/database.rb
...@@ -21,14 +19,12 @@ Database/MultipleDatabases: ...@@ -21,14 +19,12 @@ Database/MultipleDatabases:
- lib/gitlab/database/migrations/observers/query_log.rb - lib/gitlab/database/migrations/observers/query_log.rb
- lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb - lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb
- lib/gitlab/database.rb - lib/gitlab/database.rb
- lib/gitlab/database/schema_cache_with_renamed_table.rb
- lib/gitlab/database/with_lock_retries.rb - lib/gitlab/database/with_lock_retries.rb
- lib/gitlab/gitlab_import/importer.rb - lib/gitlab/gitlab_import/importer.rb
- lib/gitlab/health_checks/db_check.rb - lib/gitlab/health_checks/db_check.rb
- lib/gitlab/import_export/base/relation_factory.rb - lib/gitlab/import_export/base/relation_factory.rb
- lib/gitlab/import_export/group/relation_tree_restorer.rb - lib/gitlab/import_export/group/relation_tree_restorer.rb
- lib/gitlab/legacy_github_import/importer.rb - lib/gitlab/legacy_github_import/importer.rb
- lib/gitlab/metrics/samplers/database_sampler.rb
- lib/gitlab/seeder.rb - lib/gitlab/seeder.rb
- lib/gitlab/sherlock/query.rb - lib/gitlab/sherlock/query.rb
- lib/system_check/orphans/repository_check.rb - lib/system_check/orphans/repository_check.rb
...@@ -39,15 +35,8 @@ Database/MultipleDatabases: ...@@ -39,15 +35,8 @@ Database/MultipleDatabases:
- spec/lib/gitlab/database_spec.rb - spec/lib/gitlab/database_spec.rb
- spec/lib/gitlab/metrics/subscribers/active_record_spec.rb - spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
- spec/lib/gitlab/profiler_spec.rb - spec/lib/gitlab/profiler_spec.rb
- spec/lib/gitlab/usage_data_metrics_spec.rb
- spec/lib/gitlab/usage_data_queries_spec.rb
- spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/constraints_spec.rb - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/constraints_spec.rb
- spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/joins_spec.rb - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/joins_spec.rb
- spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb
- spec/lib/gitlab/utils/usage_data_spec.rb
- spec/models/project_feature_usage_spec.rb
- spec/models/users_statistics_spec.rb
- spec/services/users/activity_service_spec.rb
- spec/support/caching.rb - spec/support/caching.rb
- spec/support/gitlab/usage/metrics_instrumentation_shared_examples.rb - spec/support/gitlab/usage/metrics_instrumentation_shared_examples.rb
- spec/support/helpers/database_connection_helpers.rb - spec/support/helpers/database_connection_helpers.rb
......
...@@ -19,7 +19,7 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::DatabaseMetric do ...@@ -19,7 +19,7 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::DatabaseMetric do
let_it_be(:issues) { Issue.all } let_it_be(:issues) { Issue.all }
before do before do
allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) allow(Issue.connection).to receive(:transaction_open?).and_return(false)
end end
it 'calculates a correct result' do it 'calculates a correct result' do
......
...@@ -3,10 +3,6 @@ ...@@ -3,10 +3,6 @@
require 'spec_helper' require 'spec_helper'
RSpec.describe Gitlab::UsageDataQueries do RSpec.describe Gitlab::UsageDataQueries do
before do
allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
end
describe '#add_metric' do describe '#add_metric' do
let(:metric) { 'CountBoardsMetric' } let(:metric) { 'CountBoardsMetric' }
......
...@@ -43,7 +43,7 @@ RSpec.describe UsersStatistics do ...@@ -43,7 +43,7 @@ RSpec.describe UsersStatistics do
create_list(:user, 2, :bot) create_list(:user, 2, :bot)
create_list(:user, 1, :blocked) create_list(:user, 1, :blocked)
allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) allow(described_class.connection).to receive(:transaction_open?).and_return(false)
end end
context 'when successful' do context 'when successful' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment