diff options
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/background_migration/link_lfs_objects.rb | 19 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/failed.rb | 1 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lib/gitlab/background_migration/link_lfs_objects.rb b/lib/gitlab/background_migration/link_lfs_objects.rb index 014bebc4258..69c03f617bf 100644 --- a/lib/gitlab/background_migration/link_lfs_objects.rb +++ b/lib/gitlab/background_migration/link_lfs_objects.rb @@ -24,24 +24,7 @@ module Gitlab end def perform(start_id, end_id) - select_query = - ForkNetworkMember - .select('lop.lfs_object_id, fork_network_members.project_id') - .with_non_existing_lfs_objects - .where(project_id: start_id..end_id) - - return if select_query.empty? - - execute <<-SQL - INSERT INTO lfs_objects_projects (lfs_object_id, project_id) - #{select_query.to_sql} - SQL - end - - private - - def execute(sql) - ::ActiveRecord::Base.connection.execute(sql) + # no-op as some queries times out end end end diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb index 0915a98a0fa..b0b01538a30 100644 --- a/lib/gitlab/ci/status/build/failed.rb +++ b/lib/gitlab/ci/status/build/failed.rb @@ -19,6 +19,7 @@ module Gitlab unmet_prerequisites: 'unmet prerequisites', scheduler_failure: 'scheduler failure', data_integrity_failure: 'data integrity failure', + forward_deployment_failure: 'forward deployment failure', invalid_bridge_trigger: 'downstream pipeline trigger definition is invalid', downstream_bridge_project_not_found: 'downstream project could not be found', insufficient_bridge_permissions: 'no permissions to trigger downstream pipeline', |