Skip to content
Snippets Groups Projects
Commit 9678ef77 authored by Dylan Griffith's avatar Dylan Griffith
Browse files

Merge branch '409331-revert-squash' into '15-11-stable-ee'

Revert migration squash that breaks 15.11

See merge request gitlab-org/gitlab!119520



Merged-by: default avatarDylan Griffith <dyl.griffith@gmail.com>
Approved-by: default avatarDylan Griffith <dyl.griffith@gmail.com>
Approved-by: default avatarSam Kim <skim@gitlab.com>
Approved-by: Steve Abrams's avatarSteve Abrams <sabrams@gitlab.com>
Co-authored-by: Jon Jenkins's avatarJon Jenkins <jjenkins@gitlab.com>
Co-authored-by: Alex Ives's avatarAlex Ives <aives@gitlab.com>
parents d8a5f7e4 7328781b
No related branches found
No related tags found
1 merge request!119520Revert migration squash that breaks 15.11
Pipeline #857859484 passed
Pipeline: GitLab

#857888425

    Showing
    with 1172 additions and 820 deletions
    ......@@ -54,6 +54,10 @@ AllCops:
    - 'shared/packages/**/*'
    - 'spec/support/*.git/**/*' # e.g. spec/support/gitlab-git-test.git
    - 'db/ci_migrate/*.rb' # since the `db/ci_migrate` is a symlinked to `db/migrate`
    # Adding this specifically for a large revert: !118368
    <% File.readlines('.rubocop_revert_ignores.txt').map(&:chomp).each do |f| %>
    - '<%= f %>'
    <% end %>
    # Use absolute path to avoid orphan directories with changed workspace root.
    CacheRootDirectory: <%= Dir.getwd %>/tmp
    MaxFilesInCache: 1_000_000
    ......
    This diff is collapsed.
    ......@@ -22,6 +22,9 @@ ignore: |
    generator_templates/snowplow_event_definition/event_definition.yml
    generator_templates/usage_metric_definition/metric_definition.yml
    # Contains ERB code that keeps throwing syntax errors
    .rubocop.yml
    # Has some special indentation
    doc/user/project/integrations/samples/cloudwatch.yml
    ......
    This diff is collapsed.
    # frozen_string_literal: true
    class MoveLooseFkDeletedRecordsToDynamicSchema < Gitlab::Database::Migration[1.0]
    enable_lock_retries!
    def up
    if table_exists?('gitlab_partitions_static.loose_foreign_keys_deleted_records_1')
    execute 'ALTER TABLE gitlab_partitions_static.loose_foreign_keys_deleted_records_1 SET SCHEMA gitlab_partitions_dynamic'
    end
    end
    def down
    if table_exists?('gitlab_partitions_dynamic.loose_foreign_keys_deleted_records_1')
    execute 'ALTER TABLE gitlab_partitions_dynamic.loose_foreign_keys_deleted_records_1 SET SCHEMA gitlab_partitions_static'
    end
    end
    end
    # frozen_string_literal: true
    class AddIndexOnPackagesBuildInfosPackageIdPipelineId < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    INDEX_NAME = 'index_packages_build_infos_package_id_pipeline_id'
    OLD_INDEX_NAME = 'idx_packages_build_infos_on_package_id'
    def up
    add_concurrent_index :packages_build_infos, [:package_id, :pipeline_id], name: INDEX_NAME
    remove_concurrent_index_by_name :packages_build_infos, OLD_INDEX_NAME
    end
    def down
    add_concurrent_index :packages_build_infos, :package_id, name: OLD_INDEX_NAME
    remove_concurrent_index :packages_build_infos, [:package_id, :pipeline_id], name: INDEX_NAME
    end
    end
    # frozen_string_literal: true
    # See https://docs.gitlab.com/ee/development/migration_style_guide.html
    # for more information on how to write migrations for GitLab.
    class AddUpdatedStateByUserIdToMergeRequestReviewers < Gitlab::Database::Migration[1.0]
    enable_lock_retries!
    def change
    add_column :merge_request_reviewers, :updated_state_by_user_id, :bigint
    end
    end
    # frozen_string_literal: true
    class AddIndexToMergeRequestReviewersUpdatedStateByUserId < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    INDEX_NAME = 'index_on_merge_request_reviewers_updated_state_by_user_id'
    def up
    add_concurrent_index :merge_request_reviewers, :updated_state_by_user_id, name: INDEX_NAME
    end
    def down
    remove_concurrent_index_by_name :merge_request_reviewers, INDEX_NAME
    end
    end
    # frozen_string_literal: true
    class AddUpdatedStateByUserIdToMergeRequestAssignees < Gitlab::Database::Migration[1.0]
    enable_lock_retries!
    def change
    add_column :merge_request_assignees, :updated_state_by_user_id, :bigint
    end
    end
    # frozen_string_literal: true
    class AddIndexToMergeRequestAssigneesUpdatedStateByUserId < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    INDEX_NAME = 'index_on_merge_request_assignees_updated_state_by_user_id'
    def up
    add_concurrent_index :merge_request_assignees, :updated_state_by_user_id, name: INDEX_NAME
    end
    def down
    remove_concurrent_index_by_name :merge_request_assignees, INDEX_NAME
    end
    end
    # frozen_string_literal: true
    class AddIndexSnippetsOnProjectIdAndTitle < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    INDEX_NAME = 'index_snippets_on_project_id_and_title'
    def up
    add_concurrent_index :snippets, [:project_id, :title], name: INDEX_NAME
    end
    def down
    remove_concurrent_index_by_name :snippets, name: INDEX_NAME
    end
    end
    # frozen_string_literal: true
    class AddCiRunnersIndexOnCreatedAtWhereActiveIsFalse < Gitlab::Database::Migration[1.0]
    INDEX_NAME = 'index_ci_runners_on_created_at_and_id_where_inactive'
    disable_ddl_transaction!
    def up
    add_concurrent_index :ci_runners, [:created_at, :id], where: 'active = FALSE', order: { created_at: :desc, id: :desc }, name: INDEX_NAME
    end
    def down
    remove_concurrent_index_by_name :ci_runners, INDEX_NAME
    end
    end
    # frozen_string_literal: true
    class AddCiRunnersIndexOnContactedAtWhereActiveIsFalse < Gitlab::Database::Migration[1.0]
    INDEX_NAME = 'index_ci_runners_on_contacted_at_and_id_where_inactive'
    disable_ddl_transaction!
    def up
    add_concurrent_index :ci_runners, [:contacted_at, :id], where: 'active = FALSE', order: { contacted_at: :desc, id: :desc }, name: INDEX_NAME
    end
    def down
    remove_concurrent_index_by_name :ci_runners, INDEX_NAME
    end
    end
    # frozen_string_literal: true
    class AddProtectedEnvironmentsRequiredApprovalCountCheckConstraint < Gitlab::Database::Migration[1.0]
    CONSTRAINT_NAME = 'protected_environments_required_approval_count_positive'
    disable_ddl_transaction!
    def up
    add_check_constraint :protected_environments, 'required_approval_count >= 0', CONSTRAINT_NAME
    end
    def down
    remove_check_constraint :protected_environments, CONSTRAINT_NAME
    end
    end
    # frozen_string_literal: true
    class AddExecutorTypeColumnToCiRunners < Gitlab::Database::Migration[1.0]
    def change
    add_column :ci_runners, :executor_type, :smallint, null: true
    end
    end
    # frozen_string_literal: true
    class AddStatusToClusterAgentTokens < Gitlab::Database::Migration[1.0]
    def change
    add_column :cluster_agent_tokens, :status, :smallint, null: false, default: 0
    end
    end
    # frozen_string_literal: true
    class AlterConstraintOfPhone < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    def up
    constraint_phone = check_constraint_name('verification_codes', 'phone', 'max_length')
    remove_check_constraint(:verification_codes, constraint_phone)
    add_check_constraint(:verification_codes, 'char_length(phone) <= 50', constraint_phone)
    end
    def down
    constraint_phone = check_constraint_name('verification_codes', 'phone', 'max_length')
    remove_check_constraint(:verification_codes, constraint_phone)
    add_check_constraint(:verification_codes, 'char_length(phone) <= 32', constraint_phone)
    end
    end
    # frozen_string_literal: true
    class ChangeUserDetailsPhoneTextLimit < Gitlab::Database::Migration[1.0]
    disable_ddl_transaction!
    def up
    remove_text_limit :user_details, :phone
    add_text_limit :user_details, :phone, 50
    end
    def down
    remove_text_limit :user_details, :phone
    add_text_limit :user_details, :phone, 32
    end
    end
    # frozen_string_literal: true
    class UpdateTimelogsSpentAtDefault < Gitlab::Database::Migration[1.0]
    def change
    change_column_default(:timelogs, :spent_at, from: nil, to: -> { 'NOW()' })
    end
    end
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment