Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/use-long_timeout-for-fetch_internal_remote_gitaly-rpc.yml

+---
+title: Increase timeout for FetchInternalRemote RPC call
+merge_request: 18908
+author:
+type: fixed

doc/administration/geo/disaster_recovery/background_verification.md

@@ -11,9 +11,8 @@ calculated checksum. If the checksum of the data on the **primary** node matches
 data on the **secondary** node, the data transferred successfully. Following a planned failover,
 any corrupted data may be **lost**, depending on the extent of the corruption.
 
-If verification fails on the **primary** node, this indicates that Geo is
-successfully replicating a corrupted object; restore it from backup or remove it
-it from the **primary** node to resolve the issue.
+If verification fails on the **primary** node, this indicates Geo is replicating a corrupted object.
+You can restore it from backup or remove it from the **primary** node to resolve the issue.
 
 If verification succeeds on the **primary** node but fails on the **secondary** node,
 this indicates that the object was corrupted during the replication process.

doc/ci/yaml/README.md

@@ -329,6 +329,37 @@ The following stages are available to every pipeline:
 
 User-defined stages are executed after `.pre` and before `.post`.
 
+The order of `.pre` and `.post` cannot be changed, even if defined out of order in `.gitlab-ci.yml`.
+For example, the following are equivalent configuration:
+
+- Configured in order:
+
+  ```yml
+  stages:
+    - .pre
+    - a
+    - b
+    - .post
+  ```
+
+- Configured out of order:
+
+  ```yml
+  stages:
+    - a
+    - .pre
+    - b
+    - .post
+  ```
+
+- Not explicitly configured:
+
+  ```yml
+  stages:
+    - a
+    - b
+  ```
+
 ### `stage`
 
 `stage` is defined per-job and relies on [`stages`](#stages) which is defined

lib/gitlab/gitaly_client/remote_service.rb

@@ -49,7 +49,7 @@ module Gitlab
 
         response = GitalyClient.call(@storage, :remote_service,
                                      :fetch_internal_remote, request,
-                                     timeout: GitalyClient.medium_timeout,
+                                     timeout: GitalyClient.long_timeout,
                                      remote_storage: repository.storage)
 
         response.result

spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180122154930_schedule_set_confidential_note_events_on_services.rb')
 

spec/migrations/active_record/schema_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # Check consistency of db/schema.rb version, migrations' timestamps, and the latest migration timestamp

spec/migrations/add_foreign_keys_to_todos_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180201110056_add_foreign_keys_to_todos.rb')
 

spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180508100222_add_not_null_constraint_to_project_mirror_data_foreign_key.rb')
 

spec/migrations/add_pages_access_level_to_project_feature_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180423204600_add_pages_access_level_to_project_feature.rb')
 

spec/migrations/add_pipeline_build_foreign_key_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180420010016_add_pipeline_build_foreign_key.rb')
 

spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180511174224_add_unique_constraint_to_project_features_project_id.rb')
 

spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180425131009_assure_commits_count_for_merge_request_diff.rb')
 

spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180531220618_change_default_value_for_dsa_key_restriction.rb')
 

spec/migrations/cleanup_build_stage_migration_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180420010616_cleanup_build_stage_migration.rb')
 

spec/migrations/cleanup_environments_external_url_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20181108091549_cleanup_environments_external_url.rb')
 

spec/migrations/cleanup_stages_position_migration_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180604123514_cleanup_stages_position_migration.rb')
 

spec/migrations/create_missing_namespace_for_internal_users_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180413022611_create_missing_namespace_for_internal_users.rb')
 

spec/migrations/drop_duplicate_protected_tags_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180711103851_drop_duplicate_protected_tags.rb')
 

spec/migrations/enqueue_verify_pages_domain_workers_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180216121030_enqueue_verify_pages_domain_workers')
 

spec/migrations/fill_empty_finished_at_in_deployments_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181030135124_fill_empty_finished_at_in_deployments')
 

spec/migrations/fill_file_store_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180424151928_fill_file_store')
 

spec/migrations/fix_wrong_pages_access_level_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190703185326_fix_wrong_pages_access_level.rb')
 

spec/migrations/generate_lets_encrypt_private_key_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190524062810_generate_lets_encrypt_private_key.rb')
 

spec/migrations/generate_missing_routes_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180702134423_generate_missing_routes.rb')
 

spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb')
 

spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180306074045_migrate_create_trace_artifact_sidekiq_queue.rb')
 

spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180816161409_migrate_legacy_artifacts_to_job_artifacts.rb')
 

spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180603190921_migrate_object_storage_upload_sidekiq_queue.rb')
 

spec/migrations/migrate_storage_migrator_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190124200344_migrate_storage_migrator_sidekiq_queue.rb')
 

spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb')
 

spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180220150310_remove_empty_extern_uid_auth0_identities.rb')
 

spec/migrations/remove_redundant_pipeline_stages_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180119121225_remove_redundant_pipeline_stages.rb')
 

spec/migrations/reschedule_builds_stages_migration_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180405101928_reschedule_builds_stages_migration')
 

spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20180309121820_reschedule_commits_count_for_merge_request_diff')
 

spec/migrations/schedule_digest_personal_access_tokens_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180913142237_schedule_digest_personal_access_tokens.rb')
 

spec/migrations/schedule_fill_valid_time_for_pages_domain_certificates_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190524073827_schedule_fill_valid_time_for_pages_domain_certificates.rb')
 

spec/migrations/schedule_runners_token_encryption_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20181121111200_schedule_runners_token_encryption')
 

spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180104131052_schedule_set_confidential_note_events_on_webhooks.rb')
 

spec/migrations/schedule_stages_index_migration_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180420080616_schedule_stages_index_migration')
 

spec/migrations/schedule_to_archive_legacy_traces_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20180529152628_schedule_to_archive_legacy_traces')
 

spec/migrations/truncate_user_fullname_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20190325080727_truncate_user_fullname.rb')